Added historical_readings capability.  Closes #1285
removed old .bundle/config file and borked hipchat messages
Removed newrelic calls from deploy script and gem padrino-rpm from gemfile
Revert logging change

Fails on startup in torquebox
Changed capability historical_readings to machine_readings_historical and machines_readings_historical
fix version number
Remove extra inodes/ route for diagnostics
fix routes for DELETE /inodes/:inode
Merge branch '1451-delete-inode' into crm-3.3
changed target IP address for crm-vmware-ova
Merge remote-tracking branch 'origin/crm-3.3' into 1250_create_vm

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/inodes/list.haml
	config/boot.rb
	models/capability.rb
	models/inode.rb