meh
Merge branch 'master' of https://github.com/trumpi/dotfiles
Merge branch 'master' of https://github.com/trumpi/dotfiles

Conflicts:
	vim/vimrc