Conflicts:
	examples/main.c
	src/Makefile.am
	src/engine.c
	src/engine.h
	src/fof.c

Conflicts:
	examples/main.c
	src/engine.c
	src/engine.h
	src/space.c

Change VELOCIraptor file counting

See merge request !622

Santa barbara analysis scripts

See merge request !624

Use a static variable to count instead of machine time for simulation time intervals when using VELOCIraptor

Fix stars unit test

See merge request !620

Updated enum names for VELOCIraptor output.

See merge request !621

Star density

See merge request !581

Merge branch '465-separate-the-hand-written-vectorization-and-the-auto-vectorization-flags' into 'master'

Resolve "Separate the hand-written vectorization and the auto-vectorization flags"

Closes #465

See merge request !617

Trim trailing space from line before parsing it.

Closes #463

See merge request !619

Update task dependency with nber link

See merge request !616

Store particle offsets into group ID array as size_t along with the group ID, so that larger numbers of particles can be handled.

Set particle group IDs to new re-labeled ones. Added extra parameters to set the default group ID and default offset of group numbering.

Sort groups in descending order based upon size and re-label group IDs between 0-num_groups. Now done over MPI and each rank has a globally sorted list of local groups.