Added newlines. Without them, the files would not compile.
Added one more missing newline.
More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future.
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
Merge branch 'MacFixes'

Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp