fix deploy/production.rb so that it can run
Merge branch 'master' of github.com:thlias/asset-manager-v3
renamed nginx.conf to nginx.conf.erb so i was prompted to git pull