Final revisions prior to demo
Merge pull request #21 from amcgowanca/7.x-1.x

Final revisions prior to demo