Big refactoring
Merge branch 'master' of git@github.com:dwendelen/Thesis.git

Conflicts:
	opencl/16x16x16float.cl
	src/OpenCLPlatform.py
	src/OpenCLPlatform2.py
	src/OpenCLPlatformE.py
	src/simulators.py