gem update
finally back to safe state (specs are still running so may be no :P)
merged with develop
some minor refund changes
updated gems to the latest version of rails 3
refund controller test
some more tests, work from home