Emacs. Tmux C-z.
Merge branch 'master' of github.com:dhemmerling/dhemmerling

Conflicts:
	vimrc