Files pulled in manually and code style changes, Gamepad type addition by Adam Honse <[email protected]>