Merge branch 'master' of https://github.com/fog/fog into monitoring_mock

Conflicts:
	lib/fog/rackspace/requests/monitoring/get_entity.rb
	tests/rackspace/requests/monitoring/entity_tests.rb