Don't auto-enable electric-indent-mode in 24.3, where it is rubbish

Closes #236
Prefer #'version< to #'string<
Don't override RET in ruby-mode
Enable guide-key for more prefix keys
Merge remote-tracking branch 'refs/remotes/purcell/master'

Conflicts:
	lisp/init-editing-utils.el