Moved logic to pick demo or not back

* Going to keep demo 100% separated
* had to undo a few things I did under /plan/activity/
* /activity/ and /demo/ will now check session as well as post to set
variables