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
Updates the rvmrc file

For developers with RVM installed, the creation of a gemset, pulling the latest changes, and running bundler to install missing gems is now automated.

closes #122
Updates NewRelic gem

Fixes issue with yanked gem from NewRelic.

closes #132
first experimental improvement to the highlighter. gradient now files the entire height of the text line, with blue's peak alpha at the top, red in the middle, and green at the bottom--an overlapping version of the three-lane concept. also increased peak alpha val from .7 to 1 and changed to colors to straight red, blue, and green.
Memcachier and Staging environment

Cleans up the gem listing and uses new https endpoint for rubygems.org (refs #137)
Adds a staging environment for RACK_ENV and RAILS_ENV on heroku servers
Adds the memcachier gem to automagically use the memcachier service (closes #146)
Updated to Rails 3.2.13.

http://weblog.rubyonrails.org/2013/3/18/SEC-ANN-Rails-3-2-13-3-1-12-and-2-3-18-have-been-released/
Merge branch 'hotfix/20130319'
Merge branch 'hotfix/20130319' into develop

Conflicts:
	Gemfile
	Gemfile.lock
DRY the prism controller

Removes copy-n-paste duplication from prisms_controller; further refactoring could collapse several of these 'special' cases in to a single controller
Test for ruby 2.0
Adds Code Climate badge to the readme
Merges Wayne's magic_install into develop.
Merges Waynes branch feature/prism_controller_fixes
Merges Wayne\'s feature/code_climate_integration
Merge branch 'master' into develop
Merge branch 'develop' of github.com:scholarslab/prism into develop
Merge remote-tracking branch 'origin/features/highlight' into develop
Merge remote-tracking branch 'origin/develop' into honeybooboo