A bit of clean up.
Bump version.
A bit of clean up.
Bump version.
Take out debug output
Merge branch 'master' into ospalh-special

Conflicts:
	Colorful toolbar.py