Minor changes to hide additional eagle-i properties that are deprecated or involve classes not currently in VIVO
Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6

Conflicts:
	rdf/tbox/firsttime/initialTBoxAnnotations.n3
some template clean up that wasn't of blocker significance
Merge branch 'maint-rel-1.6' into develop