Fix for PROV-476

Problem was that special index fields like _count and _hier_ancestors
were translated to that new I<element> notation as well.

Also fixed the messed up indentation while I was in there.
Fix for PROV-473

Relationship bundles in 'bubbles' mode now respect display templates.
Merge branch 'master' of github.com:collectiveaccess/providence