Level Cleanups. Everything should be tagged now.
Merge branch 'master' of https://github.com/mmoy92/Grim

Conflicts: