Made a cider a manually managed package and added cider config
Added a function to more easily create multiple shells
Changed cursor-type from 'box to 'bar
Some scala+clojure defaults
Merge branch 'master' of https://github.com/timds/emacs.d

Conflicts:
	config/functions.el
	init.el