Merge branch 'pr/libussa/161'

Merge branch 'pr/davidgibbons/152'

Merge branch 'pr/madworx/151'

Merge branch 'master' into v0.6.6-ADFS01

Merge branch 'master' into pr/talltechdude/146

Merge branch 'master' of github.com:vouch/vouch-proxy

Merge branch 'reedstrm-anticlobber'

Merge branch 'artagel-add_individual_examples'

update paste instructions

Merge branch 'master' into rayward-fix-template-root