stuff
Merge branches 'master' and 'master' of http://github.com/stoeffel/.dotfiles

Conflicts:
	vimrc