modified default parameters
started to merge, not sure if I got everything
Merge branch 'master' of https://github.com/sdrendall/conditioningCage
Merged in new default parameters