haskell-mode and haml-mode have been fixed upstream to inhibit electric indentation
Decrease increment used when adjusting frame transparency
Update URL for Emacs 23-compatible version of package.el

The old hashes were clobbered by the Emacs source migration from
bzr to git.

Fixes #232
Fix commit hash for Emacs 23 version of package.el

See #232
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 'upstream/master'