More tweaks
Merge branch 'master' of https://github.com/lyddonb/dotfiles

* 'master' of https://github.com/lyddonb/dotfiles:
  More cleanup

Conflicts:
	.vimrc