if he fails, at least fails while daring greatly
Merge branch 'feature/document-blocks' of github.com:kryptnostic/iris into feature/document-blocks

* 'feature/document-blocks' of github.com:kryptnostic/iris:
  fix global hasher test because we changed client to make 1 less request
  dirtily copied our test harnesses over to this test folder bc of classpath issues with using harnesses in other projects... we need to fix this for real eventually
  fix compilation errors for new QHP api
  fix iris java 7

Conflicts:
	src/test/java/com/kryptnostic/api/v1/client/DefaultKryptnosticClientTests.java