Added machine_time_step to external devices
Merge remote-tracking branch 'origin/master'

Conflicts:
	spynnaker/pyNN/spinnaker.py