stuff
Merge branch 'master' of https://github.com/stoeffel/.dotfiles

Conflicts:
	vimrc