Cleaning up package, adding phantomjs