Updated for Swift 3.1#8

Open

below wants to merge 4 commits intobradley:masterfrom

Commits on May 29, 2017

Commits on May 30, 2017

* Removed unnecessary casts and imports for clarity
below
committed