Minor Updates
Minor Updates
Remove .idea from repository
Merge remote-tracking branch 'origin/master'

Conflicts:
	cloudproviders/rackspace/cloudservers.rb
	getServers.rb