Merge pull request #2 from philJam/simpleview

Draughtiness added etc.
heating system selection
Merge pull request #2 from emoncms/simpleview

heating system selection