Merge branch 'public_next' into private

.travis.yml

appveyor.yml

src/Makefile

src/Makefile.cfg

src/hardware/hw_main.c

src/hardware/hw_md2.c

src/p_saveg.c

src/p_user.c