Should have been c++0x, not 0x
Fully get rid of boost
Merge branch 'master' into jmobs

Conflicts:
	src/CMakeLists.txt