Add gems for production and remove unused settings
Merge branch 'develop'