update gems and .rvmrc.  Refs #1224
update gems
Merge branch 'master' into 1224_torquebox-2.3.0
Add Gemfile.lock
Remove the need to compile java on deploy
Removed new relic deployment notification
Removed kaminari and newrelic gem
Merged 1301_version_numbers with 1224_torquebox-2.3.0
Fix for powered off VMs not returning readings. Pre-populate nic and disk readings, with timestamps.
Merge latest CRM bugfixes from master.
Merge pull request #20 from 6fusion/crm-3.2.0

Crm 3.2.0
Merge branch 'master' into 1301_version_numbers

Conflicts:
	config/deploy.rb