Merge branch 'use-colorsys' of https://github.com/micolous/pylifx into micolous-use-colorsys

Conflicts:
	pylifx/__init__.py
Merge branch 'master' into develop