added some things courtesy of Steve Losh's vimrc; more minor formatting stuff