Bugfixed nondeterministic behavior of determine_q_tare
Merged in resting contact branch
Adaptive integration with resting contact now compiles (not tested)
Fixed merge