stuff
Merge branch 'master' of github.com:robin-allen/.vim

Conflicts:
	.vimrc