add when-maybe indentation
midje-mode
startup screen love
use marmalade package manager
I don't actually use midje-mode
Ignore cookies
Merge branch 'master' of github.com:marick/.emacs.d

Conflicts:
	init.el