Added an else statement to cover all the cases and avoid a UnboundLocalError.
Added installation of WX.
Merge branch 'master' into add_wx_to_travis
Merge branch 'master' into add_wx_to_travis
Merge branch 'master' into fix-datasource
Merge branch 'master' into fix-datasource
Restore optimized marker rendering in special cases.
Add test cases that provide basic code coverage and simple rendering validation.
Update CHANGES.txt
Merge branch 'master' into fix/restore_optimized_scatterplot

Conflicts:
	CHANGES.txt
Trivial clean up of unit test.
Removed the redundant exception.
Pep8.
More pep8.
PEP8 fixes to test.
Use isinstance instead of __class__.
Merge branch 'fix/restore_optimized_scatterplot' of https://github.com/enthought/chaco into fix/restore_optimized_scatterplot

Conflicts:
	chaco/tests/scatterplot_renderers_test_case.py
Fix one more isinstance case.
fix travis config for seamless PIL installation
Merge branch 'master' into fix/restore_optimized_scatterplot

Conflicts:
	CHANGES.txt