Various wording and functionality tweaks per Gabe's feedback
Merge branch 'master' of github.com:Icenium/bond-content