dispatch
Merge branch 'master' of github.com:zombiecalypse/config-files

Conflicts:
	vimrc
rm config file