Update vim and gterm color scheme

Update vimrc with later vim-airline version
Update colors for gterm
Merge branch 'master' of github.com:bcachet/dotfiles
Git config

Pull using rebase
Push only current branch
Autocorrect mispelled commands