Adjust for updated fullframe API
Don't reindent so eagerly in haml-mode
Expand "-foo" to "modname-foo" in elisp with hippie-expand
string-prefix-p is better than regexp check
Do magic "-foo" to "modname-foo" expansion only after other expansions fail

Otherwise users of dash might get undesirable results.
Handle case where there's no `(provide ...)` form
Merge 'purcell/master'

Conflicts:
	lisp/init-git.el