Added cedet to the emacs configuration, small tmux change.
Merge branch 'master' of https://github.com/EldritchCheese/settings