Change path
Merge branch 'master' of https://github.com/caseymacphee/RPi-HOUSE_Devices

Conflicts:
	devices.py
Merge branch 'master' of https://github.com/caseymacphee/RPi-HOUSE_Devices

Conflicts:
	devices.py