memory allocation in boost, tested with valgrind. new output format
cleaned up
Merge remote-tracking branch 'upstream/master'
Note: 4-point functions do not work!

Conflicts:
	main/BasicOperator.d
	main/BasicOperator.o
	main/GlobalData.d
	main/GlobalData.o
	main/LapHs.cpp
	main/LapHs_Christopher
	main/LapHs_Christopher.cpp
	main/LapHs_Christopher.d
	main/LapHs_Christopher.o
	main/Makefile
	main/ReadWrite.d
	main/ReadWrite.o
	main/config_utils.d
	main/config_utils.o
	main/io_utils.d
	main/io_utils.o
	main/propagator_io.d
	main/propagator_io.o