sync laptop
Merge branch 'master' of github.com:jnz/dotvim
removed airline

Conflicts:
	bundle/fugitive
	bundle/syntastic
	bundle/tagbar
	bundle/vim-dispatch