Minor functional changes

Will probably blow away with upcoming merge
Merge branch 'master' of https://github.com/larrynburris/Tattwho.Web