Staging to master

Merge and delete staging branch moving forward to heroku