update the damn list
Merge branch 'master' of github.com:mgius/dotFiles

Conflicts:
	vimrc