added support for virtual machines. just need wiring to be done
Merge remote-tracking branch 'origin/master'

Conflicts:
	spynnaker/pyNN/spinnaker.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	spynnaker/pyNN/spinnaker.py
fixed merge