Switch to Emacs + tmux.
Merge remote-tracking branch 'origin/master' into greystone

Conflicts:
	.gitignore