Updated gitignore
Prod settings
Merge branch 'master' of github.com:marchibbins/bootstrap-tenants