kill nrepl and ac-complete, replace with cider and company-mode
Merge branch 'master' of github.com:r4vi/emacsd

Conflicts:
	init.el