Minor changes
Merge branch 'master' of https://github.com/yan2jared/rackspace

Conflicts:
	cloudproviders/rackspace/cloudservers.rb
Merge branch 'master' of https://github.com/yan2jared/rackspace

Conflicts:
	cloudproviders/rackspace/cloudservers.rb