Merge branch 'master' of https://github.com/mattPiratt/eHome-ServerPy

Conflicts:
	server.py