* Added ability to specify stiffness/weight/similarity for non linear minctracc calls through a protocol
Merge branch 'add-stiffness-etc' into develop