added CMTV gff-consumer link
don't put in Family attribute in gff for genes without one.
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
merging in my very minor fix for gff generation with the pulled content
of ALan's context viewer

Conflicts:
	django/chadotest/chado/views.py
cmtv link
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families

Conflicts:
	django/chadotest/chadotest/settings.py
it's making me commit this!
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
higher limit for num param
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
handling of num param (if exceeds max, set to max not 4)
Merge branch 'master' of https://github.com/ncgr/lis_gene_families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families