update airline and gitgutter
upgrade
upgrade plugin
Merge branch 'master' of https://github.com/leebo/janus

Conflicts:
	.gitmodules