Updated vimrc with suggested changes from Damian Conway