Added some configuration changes for easy production setup