Updated for upstream openjpeg changes.  #206
Added ability to wrap more than one codestream.  #206
Strengthened the test by reordering the boxes.  #206
More testing for jpx wrapping.  Needs some refactoring, though.  #206
Refactoring.  #206
Merge branch 'issue206' into devel