Adding ensime.
Merge branch 'master' of github.com:tbje/config

Conflicts:
	emacs/scala-ensime.el
Merge branch 'master' of github.com:tbje/config
Merge branch 'master' of github.com:tbje/config
Adding undo-commit alias.