add plugin airline
more mappings
Merge branch 'master' of github.com:joy2fun/vimfiles

Conflicts:
	vimrc