More stuff
HmpfMerge branch 'master' of github.com:auduny/setup

Conflicts:
	vim/bundle/vim-powerline