Add powerline.
Merge branch 'master' of github.com:jaapz/dotfiles

Conflicts:
	.gitmodules