update makefile for sdl2
Baby steps towards using rust-sdl2 instead of rust-sdl.
Update default demo to rust-sdl2.
Merge remote-tracking branch 'pnk-gh/master'

Conflicts:
	Makefile