Reverting back to individual gemfiles
Merge branch 'develop'