...
Merge branch 'master' of https://github.com/nueks/rc

Conflicts:
	init.el
	site-lisp/lisp-hook.el