cleaned up header files, includes
Merge branch 'master' of https://github.com/LampGenie/Lights