Update SettingsViewController for type errors
Update ViewController for Swift changes
Merge pull request #2 from koalahamlet/master

Fixed for changing swift.