Cleaned up, time to rebuild
Merge branch 'master' of https://github.com/itsallvoodoo/home_automation