Add expected shortcuts and prevent Configuration from mapping to Mac Preferences (for now). Closes #219.
Move some options to new preferences window. Closes #217.