Fixed the parameter to be n rather than n_pre to match PyNN spec
Fixed to recognise "SpiNNaker" format correctly
Merge branch 'master' of
https://github.com/SpiNNakerManchester/sPyNNaker.git

Conflicts:
	spynnaker/pyNN/models/spike_source/spike_source_array.py