changed color ordering to be more consistent
Merge branch 'master' of https://github.com/sgowda/plot

Conflicts:
	__init__.py