Final touches for demo
Merge pull request #19 from vcnickerson/controller/mattj/dev

Final touches for demo
Fixed merge conflicts