Swapped OK and cancel in settings dialog

This causes Enter to save settings, instead of cancelling
Discard changes to settings when cancel is pressed
Merge branch 'ui-changes' of https://github.com/cs136/seashell into ui-changes