Removed powerline since it won't work with win32
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules