Use Powerline_Consolas in Windows
Merge branch 'master' of https://github.com/carstenlenz/vim-config

Conflicts:
	vimrc