vim powerline
Merge branch 'master' of github.com:yuichi-tanaka/mac-myconf

Conflicts:
	.vim/compiler/gjslint.vim