Added more config
Merge remote-tracking branch 'origin/master' into optus

* origin/master:
  Added more config
Fixed key bindings
Merge remote-tracking branch 'origin/master' into optus

* origin/master:
  Fixed key bindings