added updateRegistry stuff for joysticks
fixed merge conflicts
Merge pull request #17 from swarage/master

added updateRegistry stuff for joysticks