added geowave integration tests
fixed merge issues in readme
Merge pull request #6 from ngageoint/GEOWAVE-2-squashed

Geowave 2 - integrations tests