Fix specs
Upgrade Rails 3.2.17
Merge branch 'master' of heroku.com:splitsee3