fix lightline setting
Merge branch 'master' of github.com:mopp/vimrc

Conflicts:
	.vimrc