Merging Dev to get heroku fix

This cleans up dependencies in a way that heroku deployments will work with the most recent build engine