Changes for Swift Beta updates

Just a few tweaks to make the app useable in Xcode Beta 5, as of August 6, 2014