Installed powerline-fonts
Merge branch 'master' of github.com:alexjeffries/dotfiles

Conflicts:
	.gitmodules