Paul datastream merge

Merged in Pauls changes here:
https://github.com/futures/fcrepo4/pull/49

Shouldn't be merged. Unit tests are failing with a null pointer exception.