work
Merge github

Merge branch 'master' of http://github.com/frankmiller/dotfiles
Merge from github
removed airline again?