Switch to tmux.
Switch from nano to emacs for EDITOR.
Merge remote-tracking branch 'origin/master' into greystone