session changes
Merge branch 'gh-pages' of https://github.com/JRJurman/Turkeyday-Testing into gh-pages
new stuff, and session fix for settings