Fixed rails_12factor conflict in production.
Further fixed discrepancies for deployment and application building.
Merge branch 'master' of https://github.com/robinsonj/CSC667_GroupProject