updates to cleanup some methods changed with swift 1.1
cleaned up a few things
Merge pull request #1 from vinnyt/xcode61fix

Xcode61fix