Dependency cleanup

@itsthatguy Please review when you get a chance. I verified this all works locally with `npm link`, but I want to try actually pulling it down from npm.