Update vim plugins
One powerline to rule them all
powerline .config/powerline and .local
Merge branch 'master' of github.com:dangerous/dotfiles

Conflicts:
	.gitmodules