Some clean up! Latest Misthaven, not integrated

-Latest Clean up of the repository!
-Latest Misthaven not integrated with Aaron's code yet.