Updated vimrc with some extra goodness