Merge pull request #35 from pivotalcommon/airline

Replace powerline with airline
Merge remote-tracking branch 'upstream/master'