clean up tmux.conf a little
always playing with aliases
add marmalade and org-mode to emacs config
Copy tons of stuff from scudco and probably screwed evertyhing up