merging
Merge branch 'master' of git://github.com/galp/boattr

Conflicts:
	boattr.rb
split sensors into groups and add some more temp sensors for the boat.