added cider
Merge branch 'master' of github.com:knuthy/emacs.d

Conflicts:
	config-files/better-defaults.el
	config-files/ecb.el
	init.el