Updated setup
Merge branch 'master' of https://github.com/SpiNNakerManchester/SpiNNMan