Refactored configuration
OSX compilation fixes
Merge pull request #152 from corporateshark/config

Refactored wcm-config