replace powerline with airline
fix indent settings for Golang
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules
	bundle/vim-airline
	vimrc