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

Conflicts:
	.emacs.d/.saved-packages
	.emacs.d/init-org.el
	.emacs.d/init.el
Automatically create abbrevs for fixing spelling errors.
Setting up Mac fn key has Hyper
Adding daily agenda block to work agenda block.
Project setup tweaking.
Moving global-auto-complete-mode start to init.el
Auto-complete mode tweak.
Starting flx-ido and smex properly.
New abbrevs
New useful packages.
Merge branch 'cyrus' of github.com:verdammelt/dotfiles into cyrus

Conflicts:
	.emacs.d/init-misc.el
Switching to Solarized Light.
Some Projectile settings must be set before loading the package.
Ignoring projectile cache file.
Removed unnecessary key binding for smex.

It does that on its own.
Cleaning up how text-mode is setup.
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.