TST: Reset baseline for failing border test case
TST: Increase tolerance for default scale estimator
TST: Use assertTrue rather than assertIs for python 2.6
CLN: Indentation had tabs instead of spaces
TST: Workaround for assertLess in python 2.6
TST: Run nosetests with -v flag on Travis CI
TST: Use traits.testing.unittest_tools for python 2.6 compatability
Merge pull request #143 from enthought/test/fix_failing_tests

Fix failing tests
Merge branch 'master' into test/travis_verbose
TST: Add Travis CI build status to README
Merge pull request #145 from enthought/test/travis_verbose

TST: Run nosetests with -v flag on Travis CI
Merge pull request #146 from enthought/test/travis_banner

TST: Add Travis CI build status to README
Merge branch 'master' into python3

Conflicts:
	chaco/scales/scales_test_case.py