Yo hello this is a random commit to fix my stash breakage
Merge branch 'master' of http://github.com/JonasT/Blitwizard into jonas

Conflicts:
	src/physicsinternal.cpp
	src/physicsinternal.h
Adding stamp-* files (autoconf for config.h apparently) to .gitignore
Merge remote-tracking branch 'upstream/jonas' into physics_api_fix_readable_2013-05-03

Conflicts:
	src/physicsinternal.cpp
Minor fixes. Code does not compile as of now.