Updated README with some notes on contributing - we want to avoid contributors working on master as this can cause conflicts
Merge branch 'master' into develop