add ensime module
Merge branch 'master' of http://github.com/daewon/dot

Conflicts:
	.emacs