Use the correct ifdefs, so we only load plugins if we've asked for them, not simply if they're available
Merge branch 'windows' of https://github.com/peternewman/ola into windows
Merge pull request #506 from peternewman/windows

Use the correct ifdefs, so we only load plugins if we've asked for them,...
Merge branch 'master' of https://github.com/OpenLightingProject/ola into trigger