Incorporate desktop vimrc

My desktop's vimrc had trailing whitespace highlighting, so add that to
the master one. Also it had formatoptions with the tabbing and
indentation stuff, so put it here as well. Also, alphabetize those
settings, just cuz.