horrible mixed commit full of random changes.  Bad, but need to get this stuff on the demo server
Merge branch 'master' of github.com:fogbeam/Quoddy
fix merge conflicts