Convert to Swift 3#4

roark31337 wants to merge 2 commits intobsmith11:swift-3.0bsmith11/MapSnap:swift-3.0from

roark31337:chore/swift-3-migrationroark31337/MapSnap:chore/swift-3-migrationCopy head branch name to clipboard