Changes to the simulation, and addes -demo flag to the DataInterface timers
Merge branch 'master' of https://github.com/mkni1408/PowerViz
Set timer in OnOffDiagram (added -Ddemo option) and fixed watt calculation in DataInterface
Merge branch 'master' of https://github.com/mkni1408/PowerViz