Updates
Merge branch 'master' of https://github.com/walshc/.dotties

Conflicts:
	.vimrc