Removed the deploy route. Too much headache. I'll just run the deploy script manually from the server. It's a one line command to deploy, anyway
Merge branch 'master' into ogprod