Moved keyboard shortcuts to settings

Also added "General" settings tab and two new options.