mo stuff
Merge branch 'master' of github.com:zekus/dotfiles

Conflicts:
	vimrc