Switch from auto-complete to cider (so we appear cool)
Merge branch 'master' of https://github.com/RallySoftware/rally-emacs

Conflicts:
	init.el