Merging in Stephen's change plus removed v1 directory

Just a few changes needed to be made. NBD.

One tip, when you go to make any changes to an existing code base, whether adding something in or refactoring, try making a new branch. That way, when you're finished, you can checkout again into "develop", pull from "upstream" (which SHOULD merge any changes made between when you made the new branch to now cleanly), rebase your new branch onto "develop" again, merge, then do a pull request. That's what I do to make sure everything goes smoothly.