Fixed Vars; Removed Patch Scripts
Merge branch 'master' of https://github.com/afinity/flaming-octo-batman