General upgrade:
-- works with jruby 1.7.3
-- adding bundler
-- upgraded to rspec 2 and rr 1.0.4
Merge pull request #1 from originalpete/master

Upgraded to rspec 2