Merge branch 'evapp' of https://github.com/Gavin-McCormick/watttime into evapp
Merge branch 'develop' of https://github.com/Gavin-McCormick/watttime into develop
Tweaks to messages.py