Switch to using geotrellis master branch

Fixes missing dependency issue.
Were we previously using changes/features in this branch that have been merged into master now?