Removes loading emacslocalinit.el. You can just make that your own emacs-live package.
Fixes paredit bindings on OS X term.
Adds Maramalade package repo.
Merge branch 'master' of github.com:selassid/selassid-pack

Conflicts:
	config/bindings.el
	config/selassid-conf.el
Sets COMMIT_EDITMSG auto mode to change log.