Merge branch 'master' of github.com:verdammelt/dotfiles

Conflicts:
	.emacs.d/.saved-packages
	.emacs.d/init-org.el
	.emacs.d/init.el
Rearranging setup code in init-misc.el
Improvements to startup.

1. smaller initial font-size
2. initialize smex mode (after ido-hacks)
3. initialize global-auto-complete-mode here.
4. flx-ido-mode
Merge remote-tracking branch 'refs/remotes/origin/cyrus'

Conflicts:
	.emacs.d/init-misc.el
	.emacs.d/init-org.el
	.emacs.d/init.el
Moving more misc into init-misc.

I want init.el to really just be about very basic setup, loading
specialized setup files and then starting things up.
Removing cider

Need to reassess the Clojure landscape.
Fixing Markdown setup.
Rolling my own simple package maintenance system.

First stop - making sure needed packages are installed.