Merge pull request #1 from tenach/master

Cleaned up! ohgod
Merge pull request #2 from tenach/master

Left out Files
OH MY GOD WTF DID I DO
fixing ignorance.
Revert "more fixes"

This reverts commit effd322541550a800b5544a05bebb0225c55e6f6.
...
now to re-clean up.