Merge branch 'develop' of github.com:SeqWare/seqware into develop
Merge branch 'develop' of github.com:SeqWare/seqware into develop