Emphasised specifying the `dev` branch as the integration branch
Updated use of github issues in CONTRIBUTING.md
Better tester port determining. Turns out pid is prone to duplication
Merge branch 'master' into dev-mac
Merge branch 'dev' into dev-mac