switch to "consensus_region" for cvterm as per recent internal discussions
Merge branch 'master' of https://github.com/ncgr/lis_gene_families into drupal_isu_20140903
Merge https://github.com/ncgr/lis_gene_families into drupal_isu_20140903
Merge https://github.com/ncgr/lis_gene_families into drupal_isu_20140903
Merge https://github.com/ncgr/lis_gene_families into drupal_isu_20140903
add support for linking in by gene family name
add endpoint for phylo_view_name
link via phylo_view_name, add description to table
changed font to avoid navbar overlap- possibly not the right solution, but works for now
moving to use of non-pk identifiers
fix gff_download setting of chromosome length
link to tree
remove linkout to older (primitive) context view, rename new, many vestiges left
mods for handling of leaf nodes in ajax call for linkouts
fix links to families
Merge branch 'master' of https://github.com/ncgr/lis_gene_families into drupal_isu_20140903
adjustments for naming prefix 'Phytozome_10|' on trees; may change (probably consn| should be Phytozome_10| instead)
don't link phylo slide to MSA
Merge branch 'master' of https://github.com/ncgr/lis_gene_families into drupal_isu_20140903

Conflicts:
	django/chadotest/chado/urls.py
Merge branch 'master' of https://github.com/ncgr/lis_gene_families into drupal_isu_20140903