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

diff --cc encode_submission/encode3.py
index 82e0401215e5fc3bb85cf25ee8b3b9a5159c9999,a3f6d29642bd2e391d8f6802bd138c72a76a86f1..1e1a54a64c8f5e441e6b6f085f5b0b55924c6da8
--- 1/encode_submission/encode3.py
--- 2/encode_submission/encode3.py
+++ b/encode_submission/encode3.py
@@@ -134,19 -123,9 +121,9 @@@ def main(cmdline=None)
  
      if opts.print_rdf:
          writer = get_serializer()
 -        print writer.serialize_model_to_string(model)
 +        print(writer.serialize_model_to_string(model))
  
  
- def make_manifest(mapper, results, filename=None):
-     manifest = mapper.make_manifest(results)
- 
-     if filename is None or filename == '-':
-         sys.stdout.write(manifest)
-     else:
-         with open(filename, 'w') as mainifeststream:
-             mainifeststream.write(manifest)
- 
- 
  def make_parser():
      parser = OptionParser()
  

diff --cc htsworkflow/submission/submission.py
Simple merge