Add git aliases for resolving merge conflicts
Add zsh to movein.sh
Clean-up (maybe?) ruby-mode file patterns
Emacs: set up nrepl-mode
tmux.conf: increase size of scrollback buffer
tmux.conf: clean-up