Merge pull request #13 from brianmckenna/testbed

non-UGRID index is now tuple
long Sunday...