Merge in deployment and WSGI files from master