Deploy.
Changed Gemfile
Change rakefile back to gh-pages
Add CNAME again to use gh-pages
Merge branch 'integration'
Remove middleman-gh-pages gem, since we're using Heroku
Merge it all together to get master and integration back in sync. This is NOT the deployed site; do not push to production