1. Added ctrl-based shortcut to OSX keymap to maintain my sanity when using a Mac.
2. Updated a couple defaults to match our conventions.