frankentheme && some paredit bindings
Merge branch 'master' of github.com:isaksky/.emacs-live-pack

Conflicts:
	config/bindings.el
	config/setup-ffip.el