Add some extra keybindings

`prelude-smart-open-line` is now bound to `M-o` as well
`prelude-start-open-line-above` is not bound to `M-O` as well
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Add some extra keybindings