Merge pull request #334 from peternewman/trivial-fixes

Fix the build
Merge pull request #335 from peternewman/trivial-fixes

Add the full UID string to the JSON API too, fixes #313
Merge branch 'master' of https://github.com/OpenLightingProject/ola into trivial-fixes