Clean up specs to work in 0.16.1
Clean up for 0.16.1
Remove WhirlyGlobe.