Merge pull request #322 from peternewman/trivial-fixes

More using cleanup
Merge pull request #323 from peternewman/trivial-fixes

More using cleanup
Merge pull request #324 from peternewman/trivial-fixes

Even even more using cleanup
Merge branch 'master' of https://github.com/OpenLightingProject/ola into trivial-fixes