Improved highlighting and whitespace handling. added comments
Merge branch 'master' of github.com:calebsmith/vimrc