copying changes from latest dry run down to code
Merge branches 'master' and 'master' of https://github.com/tjconsult/jiveworld-demo

Merging down Todd's changes to local repo