Fixed Joystick Function and Switched to Ini *merge*
Enigma.exe now reads settings from settings.ini and fixed joystick_button
to use shift to make it read properly. Please merge when ready.
Added more options to ENIGMA.exe so you can turn of checking for java and
force on the console window.
Merge pull request #352 from RobertBColton/master

Fixed Joystick Function and Switched to Ini *merge*