Update core options and retroinput inline with nightly git repo
Oops
Merge pull request #37 from lordashram/master

Update core options and retroinput inline with nightly git repo