Working version
Merge branch 'master' of https://github.com/zipkid/DomoZ

Conflicts:
	domoz.rb
	domoz/wipi.rb
	learn/test-wiringpi.rb