Cleaning up the repo

There, a proper commit. The last one was a result of me using the windows GitHub Client with FlashDevelop - that combination didn't really work out for some reason. Here I just grabbed the changes and merged them myself for a cleaner diff. Sorry about that. Again, you'll likely have to force the push, though I'm unsure as to what that'll do with your commit history (as you used an old account before)