To avoid port collisions, developers should not start/stop any services on these two machines. All development should happen on personal machines.
Are we going to set up a shared space for showing work-in-progress to others? Or is the intention to just wait until the end of each cycle before getting feedback?
For testing individual commits to master, we will use a crash-and-bash machine that Chris will setup. The Continuous Integration server will automatically deploy to this machine so it should always be up-to-date with the last commit to master.