Commit of stuff so I can update and merge
Merge branch 'master' of https://github.com/JimHokanson/matlab_NEURON

Conflicts:
	matlab_code/+NEURON/+simulation/+extracellular_stim/+sim_logger/@data/data.m