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
Add check for emacs version on startup (see #161)
Don't reference paredit-backward-delete-key until paredit is loaded

See #161
Drop maxframe and init-maxframe
Merge remote-tracking branch 'refs/remotes/purcell/master'

Conflicts:
	init.el