Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
authorDiane Trout <diane@ghic.org>
Wed, 11 Jan 2017 00:58:11 +0000 (16:58 -0800)
committerDiane Trout <diane@ghic.org>
Wed, 11 Jan 2017 00:58:11 +0000 (16:58 -0800)

Trivial merge