vim-powerline
Merge branch 'master' of github.com:airhuman/my_vim_conf

Conflicts:
	vimrc