Clean up the config file #directives so vssetup works properly.
Merge branch 'master' of github.com:ermo/privateer_wcu