PRE Chris's changes

Currents, speed, parameters all match
load is now function of theta

also added global parameter 'slip'
fixed simulation and moving back to estimating inertia
remapped current and voltage inputs after e stop button install
added new parameter estimation files
Merge branch 'master' into working_files