Adding a local cider connect shortcut
Merge branch 'master' of github.com:steveshogren/Dot-Emacs

Conflicts:
	init.el