Add timer
Cosmetics: reindent
Fix segfaults
Merge branch 'master' into parallel_barnes

Conflicts:
	Makefile.am
whoop whoop it is faster... wonder if it works correctly