Merge branch 'master' into django1.4

diff --combined htsworkflow/pipelines/genomemap.py
index 1dd95df86578bd83b75468779f1d08e1c4f3988e,4dbbc2dce6dd12f32a2ae38aa55ae69237d4abfb..6dfcf68fc235775a8280dd1bc0719e4fd513c7e4
--- 1/htsworkflow/pipelines/genomemap.py
--- 2/htsworkflow/pipelines/genomemap.py
+++ b/htsworkflow/pipelines/genomemap.py
@@@ -3,7 -3,7 +3,7 @@@
  from glob import glob
  import os
  import collections
 -from htsworkflow.pipelines.runfolder import ElementTree
 +from htsworkflow.pipelines import ElementTree
  
  vldInfo = collections.namedtuple('vldInfo', 'name is_link')
  
@@@ -77,13 -77,15 +77,15 @@@ def guess_genome(contig_sizes)
      # guess genome names
  
      genomes = {'chr1': {197195432: 'mm9',
-                         247249719: 'hg19',
+                         247249719: 'hg18',
                          200994015: 'galGal3',
+                         230208: 'saccer1',
                          },
                 'chrI': {230218: 'sacCer3',
                          15072421: 'elegans190'},
                 '1': {60348388: 'danRe6'},
-                'chr2L': { 23011544: 'dm3' },
+                'chr2L': { 23011544: 'dm3',
+                           49364326: 'Anopheles_gambiae'},
  
                 }