[#14] Couple of minor template tweaks
[#14] Fix for org breadcrumbs on sources
[#16] Add organization to source dict
[#14] Use source.organization again after fix in 949bb6f
Merge branch '14-template-tweaks' into release-v2.0