Updated to support other folders being used in the path
Merge branch 'workshop_jan_2015_code-freeze' of https://github.com/SpiNNakerManchester/sPyNNaker.git into workshop_jan_2015_code-freeze