Merge branch 'master' into binaries

Conflicts:
	nengo_spinnaker/ensemble_vertex.py
	nengo_spinnaker/filter_vertex.py
	nengo_spinnaker/nengo_vertex.py
	nengo_spinnaker/receive_vertex.py
	nengo_spinnaker/simulator.py
	nengo_spinnaker/transmit_vertex.py
Fix merge errors.
Include subpackages in setup.py.
Merge pull request #30 from ctn-waterloo/binaries

Packaging Improvements
Merge branch 'master' into refactored-vertices

Conflicts:
	nengo_spinnaker/ensemble_vertex.py
	nengo_spinnaker/filter_vertex.py
	nengo_spinnaker/nengo_vertex.py
	nengo_spinnaker/nodes/receive_vertex.py
	nengo_spinnaker/simulator.py