Appended keyword argument the "model=self.nest_synapse_model" when
connecting with non-standard receptor types in the
"nest.projection._convergent_connect" to match standard receptor
case and the "synapse_model" keyword argument used in the GetConnections
filter used to populate the self.connections list
Merge branch 'master' into toms_devel
The `recording` and `random` modules now import mpi4py only on demand
Fixes #241
`ParameterSpace.evaluate(mask)` now fully evaluates parallel-safe `RandomDistributions` before applying the mask; partial evaluation is not safe in this case. cf #244
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into toms_devel

Conflicts:
	src/recording/__init__.py