Merge pull request #796 from bvssvni/master

Upgraded to latest piston-current
Pointing rust-sdl2 to temporary fork

See https://github.com/PistonDevelopers/piston/issues/798