update rails
make spec rake tasks conditional on rspec availability
bump rake because it seems to work fine
minor test fix

many cuke tests are still failing
Merge branch 'itsisu-dev' into itsisu-staging