Updated to build correctly
Updated to work with isinstance
Merge branch 'master' of
https://github.com/SpiNNakerManchester/sPyNNaker.git

Conflicts:
	spynnaker/pyNN/models/pynn_population.py
	spynnaker/pyNN/spinnaker.py
Merge branch 'master' of https://github.com/SpiNNakerManchester/sPyNNaker.git