Remove heroku gem dependency
Merge branch 'develop' of github.com:scholarslab/prism into develop

Conflicts:
	Gemfile.lock
Updates the version of rails

Closes security issue for JSON parsing and security vulnerabilities.

closes 105
closes 121