oops.
oops.

Merge branch 'paralogy_update' of https://github.com/ComparativeGenomicsToolkit/Comparative-Annotation-Toolkit into paralogy_update

* 'paralogy_update' of https://github.com/ComparativeGenomicsToolkit/Comparative-Annotation-Toolkit:
  Consensus finding bug.

# Conflicts:
#	cat/consensus.py

ComparativeGenomicsToolkit/Comparative-Annotation-Toolkit,ucsc-mus-strain-cactus/Comparative-Annotation-Toolkit,ComparativeGenomicsToolkit/Comparative-Annotation-Toolkit