Added Q to package.json
Removing a lot of the fibrous code, drastically helping the situation in #61