Add vim-airline (and apparently update all sorts of other things)
Fix git amend
Stop blowing up when there is no guard/shell