switch to new powerline
Merge branch 'master' of github.com:crahles/vimfiles

Conflicts:
	vimrc