Scene Edits and Script Fixes
Conversion of Scene and Generic Scene to one script.

Also fixes all the scenes to use it properly.
Merge With John's Scenes
Merge pull request #268 from Kiroshima/master

Generic Scene and Scene merge.