Merge pull request #64 from Windower/4.1

4.1 Sync
Merge pull request #65 from Windower/4.1

4.1 Sync
Update ohShi.lua
Update default_settings.lua
Update helper_functions.lua
Merge pull request #547 from nitrous24/4.1

Ohshi fixes (hopefully)