Merge pull request #2 from emoncms/simpleview

heating system selection
Occupancy added, living area set etc.
Merge pull request #3 from philJam/simpleview

Occupancy added, living area calc etc.