tmux powerline - now playing
stuff
Comment out OSX specific stuff
Merge branch 'master' into tabs