Fixed some formatting issues with spec_helper file.
Changed whenever and lograge gems to only be included when not being deployed to Heroku.
Resolved merge conflict.