Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7