Merge branch 'master' of https://github.com/cjohnevans/Gannet2.0

Conflicts:
GannetFit.m~
Revert "Merge branch 'master' of https://github.com/cjohnevans/Gannet2.0"

This reverts commit b12a7ca28019d06a22dd1435fb1be6db4b27a0e9.
new sync
Merge branch 'master' of https://github.com/cjohnevans/Gannet2.0