Remove a problematic keybinding
Merge remote-tracking branch 'upstream/master'

Other sundry changes:
* Fix ergoemacs backward line kill.
* Re-enable cursor color.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.