Fix error with sporckets-helpers
Merge branch 'fix-conflict-sprockts-helpers' into all-custom-error

* fix-conflict-sprockts-helpers:
  Fix error with sporckets-helpers
fix generators for projects using shoulda and rr with Test::Unit
make Test::Unit tests actually run
Merge pull request #1212 from sshaw/master

Some fixes for Test::Unit/Shoulda/RR test cases
Merge remote-tracking branch 'upstream/master' into all-custom-error

* upstream/master:
  make Test::Unit tests actually run
  fix generators for projects using shoulda and rr with Test::Unit