Switched to fancy powerline
Merge branch 'master' of github.com:senft/vim-files

Conflicts:
	.vimrc