incorporated integration with main app in the same way that heroku discussion does.  https://github.com/heroku/discussion
Merge branch 'master' into incorporate-heroku-main-site-integration
Spec fixes

- stub session syncronization for specs
- do not syncronize on js or json requests
Merge pull request #2 from LessonPlanet/incorporate-heroku-main-site-integration

integrate with main site