from powerline to airline, no swap, solarized theme
acp
Merge branch 'master' of github.com:lucaong/Vimfiles

Conflicts:
	.gitmodules
	bundle/acp