Switched over to airline
Merged in updated tmux conf