Added some of my own aliases, fixed some other stuff
Re-enabled push default to simple
README: Update Lauri Ranta’s hidden preferences URL

The previous URL now 404s.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  README: Update Lauri Ranta’s hidden preferences URL