Pick terrain instead of the ellipsoid.

Fixes #279.
Merge pull request #281 from NICTA/pickTerrain

Pick terrain instead of the ellipsoid.