Add powerline settings
Merge branch 'master' of github.com:mathiasuk/dotvim

Conflicts:
	vimrc/common