Reinstalling cider to fix the connection issues
Merge branch 'master' of github.com:steveshogren/Dot-Emacs

Conflicts:
	elpa/archives/melpa-stable/archive-contents