Outline mode tweaks. And keybinding updates.
Merge branch 'master' of github.com:tobytripp/emacs.d
Merge branch 'master' of github.com:tobytripp/emacs.d

Conflicts:
	lib/ruby-hooks.el
Tweak magit a touch. Robustify startup.

Fix some diminish issues.
In progress tweaks.  Try out xiki.
Merge branch 'master' into el-get

Conflicts:
	lib/git-env.el
	lib/html-hooks.el
	lib/modeline-custom.el
	lib/ruby-hooks.el
	packages.el