Merge pull request #506 from peternewman/windows

Use the correct ifdefs, so we only load plugins if we've asked for them,...