Still trying to get this to work right.
Still trying to get this to work right.
Merge remote-tracking branch 'origin/master' into tests-run

Conflicts:
	spec/spec_helper.rb
Removed a debug line
Merge pull request #19 from atpay/EG-1743

EG-1743 - allows TeamCity to run, pass all tests