large-scale cleanup of vimrc: group settings, remove redundant
comments, remove unused settings.

Also stuck a cleanup command for trailing whitespace in there.
Merge branch 'master' of github.com:GitOnUp/environs