set $POWERLINE_COMPATIBLE variable
Merge branch 'master' of github.com:delphinus35/dotfiles
Merge branch 'master' of github.com:delphinus35/dotfiles
Merge branch 'master' of github.com:delphinus35/dotfiles
Merge branch 'master' of github.com:delphinus35/dotfiles
Merge branch 'master' of github.com:delphinus35/dotfiles

Conflicts:
	.vim/rc/powerline.vim