Increase nginx timeout
Merge remote-tracking branch 'origin/master'
accepting the change from master that Andrew made
removing un needed stuff