Bugfixes
Merge branch 'master' of https://github.com/camerazn/coffeebot

Conflicts:
	coffeepi_controller.py