WIP
conditionally switching client source on admin configuration
rename options to match #3 changes
no cookies here...yet
Merge pull request #1 from thinkthroughmath/pks/hand_in_the_cookie_jar

Switch data source