Merge branch 'next' into camera-fix

.travis.yml

cmake/Modules/FindGME.cmake

comptime.bat

src/CMakeLists.txt

src/Makefile

src/d_main.c

src/d_main.h

src/p_enemy.c

src/sdl/CMakeLists.txt