More Changes, added conductance vectors

all variables going to infinity within 10 iterations
Merge remote-tracking branch 'origin/master'

Conflicts:
	NeuronModel.m