more cleanup
Merge branch 'master' of https://github.com/lyddonb/dotfiles

* 'master' of https://github.com/lyddonb/dotfiles:
  cleaning up vimrc
  fix js tabbing
  Add go vim plugin
  mutt and slate changes

Conflicts:
	.vimrc