update vortex detection code
Merge branch 'master' into params

Conflicts:
	scripts/gpeget2dvort.m