Merge branch 'master' into toms_devel
Merge branch 'master' into toms_devel

Conflicts:
	src/recording/__init__.py
Merge branch 'master' into toms_devel
get_mpi_comm to return a dictionary to containing all the required flags
Merge branch 'master' into toms_devel
Merge branch 'master' into toms_devel
fixed up problem with merge
added check for local indices before attempting to set status
passed clear from Population.write_data to Recorder.write as it appears
it is meant to be
Merge branch 'master' into toms_devel

Conflicts:
	src/connectors.py
Merge branch 'master' into toms_devel
Merge branch 'master' into toms_devel
removed hack for when there were no local connections (will see if it
still causes a problem)
Merge branch 'toms_devel'
removed 'StandardCellType' from list of standard models returned by pyNN.neuron.list_standard_models()
Merge branch 'master' of https://github.com/tclose/PyNN
Merge branch 'master' of https://github.com/tclose/PyNN
Merge branch 'master' of https://github.com/tclose/PyNN
Merge branch 'master' of https://github.com/tclose/PyNN