Use powershell instead of powerline-shell and update some vim stuff
Merge branch 'master' of github.com:rmbl/dotfiles

Conflicts:
	.gitmodules