forgot makefiles actually cares for tabs
Some minor fixes
Fix osx disables to work correctly
Remove par2 temporary
removed static initialization
Merge branch 'master' into parallel_barnes

Conflicts:
	Makefile.am
fix in makefile
parallelized barnes_hut algorithm