Bugfix commit
Merge branch 'master' of github.com:ajheaps/cfplot

Conflicts:
	cfplot/__init__.py