Merge branch 'RC4' of https://github.com/SpiNNakerManchester/sPyNNaker.git into RC4

Author: rowleya

spynnaker/pyNN/models/neuron/builds/if_curr_dual_exp_base.py

@@ -22,7 +22,7 @@ class IFCurrDualExpBase(AbstractPopulationVertex):
         'tau_m': 20.0, 'cm': 1.0, 'v_rest': -65.0, 'v_reset': -65.0,
         'v_thresh': -50.0, 'tau_syn_E': 5.0, 'tau_syn_E2': 5.0,
         'tau_syn_I': 5.0, 'tau_refrac': 0.1, 'i_offset': 0,
-        'isyn_exc': 0.0, 'isyn_inh': 0.0, 'isyn2_exc': 0.0}
+        'isyn_exc': 0.0, 'isyn_inh': 0.0, 'isyn_exc2': 0.0}
 
     none_pynn_default_parameters = {'v_init': None}
 
@@ -48,14 +48,14 @@ def __init__(
             i_offset=default_parameters['i_offset'], v_init=None,
             isyn_exc=default_parameters['isyn_exc'],
             isyn_inh=default_parameters['isyn_inh'],
-            isyn2_exc=default_parameters['isyn2_exc']):
+            isyn_exc2=default_parameters['isyn_exc2']):
 
         neuron_model = NeuronModelLeakyIntegrateAndFire(
             n_neurons, v_init, v_rest, tau_m, cm, i_offset,
             v_reset, tau_refrac)
         synapse_type = SynapseTypeDualExponential(
             n_neurons, tau_syn_E, tau_syn_E2, tau_syn_I, isyn_exc,
-            isyn2_exc, isyn_inh)
+            isyn_exc2, isyn_inh)
         input_type = InputTypeCurrent()
         threshold_type = ThresholdTypeStatic(n_neurons, v_thresh)