Various dotfile updates
Merge branch 'master' of github.com:adam-may/dotfiles

Conflicts:
	.bashrc
	.vimrc.local