Merge master, thermistortables suck

Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
Reset jerk to defaults

Signed-off-by: Matthew Schick <matthew.schick@gmail.com>