Merged with desktop, tmux powerline setting I believe
Merge branch 'master' of https://github.com/skimm/dotfiles