move from powerline to airline
Merge remote-tracking branch 'thefishbowl/master'