Merge remote-tracking branch 'pn/master'
Merge branch 'master' of https://code.google.com/p/open-lighting
Merge branch 'master' of https://github.com/OpenLightingProject/ola
Fix outstanding nits
Merge pull request #286 from peternewman/master

Fix outstanding nits from previous merge.