Does not work with gcc 4.7, it seems
Apparently, I'm really bad at C++, who knew?
Merge branch 'broken_distribution'

Conflicts:
	Makefile
The simulation at least runs now