Add some usability improvements for emacs
Add a tmux conf file
Add a bunch of python-related items to emacs
Resolve merge from remote