mostly merge some pieter edits
Merge branch 'master' of github.com:mdlaskey/Grasp_Metric_Paper-
Merge branch 'master' of github.com:mdlaskey/Grasp_Metric_Paper-
some edits