Removed old flock parameters. Added single parameter for circling and normal flocking