Add basic key binding and joystick support
Minor stuff

Conflicts:
	.gitignore
Comment derp
Merge pull request #4 from staven/for-upstream

Basic support for key configuration and gamepads