Watch for settings file creation
Merge branch 'master' into PombeirP/BuildServerIntegration