Updated vimrc file, more common-sense options.