Rinari and bundler
Merge branch 'gh-pages' of github.com:sachac/.emacs.d into gh-pages
Merge branch 'gh-pages' of github.com:sachac/.emacs.d into gh-pages

Conflicts:
	Sacha.org
Try to load magit from source
Merge branch 'gh-pages' of github.com:sachac/.emacs.d into gh-pages