A few mintor changes
Merge github.com:AndyWerder/SettingsViewController
Trying to fix the inconsistency between remote and local master