Another batch of using cleanup
Merge branch 'master' of https://github.com/OpenLightingProject/ola into trivial-fixes
Merge pull request #325 from peternewman/trivial-fixes

Another batch of using cleanup