Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	hs-clojure.el
	hs-custom.el
	init.el