let screen-256color have 256 colours
Merge remote-tracking branch 'origin/master'
add Golang stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	ftplugin/go/fmt.vim
	ftplugin/go/import.vim
replace powerline with airline