Added ecb
Merge branch 'master' of github.com:dparnell/emacs_config

Conflicts:
	.gitmodules
	init.el