getting tests to work with jenkins
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rakefile
	test/functional/test_batch.rb
All tests pass in jenkins for ruby 1.9.3 with batch
all tests pass on 1.9.2 in jenkins