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