Merge branch 'master' of github.com:ngageoint/mrgeo
Mods to fix unit tests and dependency problems
Merge changes to fix unit tests and dependency problems