Added composer.json, got rid of stuff it no longer seems to need
Merged