Merge branch 'vicow' of github.com:pryv/integration-osx
Merge branch 'vicow' of github.com:pryv/integration-osx
updated settings to match Pryv