first tests
Merge branch 'master' into tests
removed logging temporarily
Merge branch 'tests' of github.com:cboursnell/transrate into cboursnell-tests

Conflicts:
	test/test_test.rb
finish merge