modified:   setup.sh
	renamed:    Home.conf -> setup/Home.conf
	renamed:    tmp/HomeAutomation.php -> setup/HomeAutomation.php
	renamed:    tmp/config.json -> setup/config.json
	new file:   setup/init
	new file:   setup/settings.json
Merge branch 'master' of https://github.com/spuduk/HomeAutomation

catchup