worked on fixing heroku push issues
pulled in fixes from nathaniel and merged