Git Flow init.
Fixed path to powerline in .vimrc.
Merge branch 'develop'

Conflicts:
	.vimrc