Updates
Merge branch 'master' of https://github.com/herbertjones/config

Conflicts:
	vimrc