KNIFE-282: Add the ability to inject files on server creation
fixing merge
KNIFE-282: fixing formatting
Merge pull request #46 from rackerlabs/KNIFE-282

KNIFE-282 Add the ability to inject files on server creation
updated for 0.7.0 instead of 0.6.4
consolidate on rackspace_auth_url since that syncs with Fog. Fix for knife-181
KNIFE-181 merge
Merge branch 'master' into KNIFE-271

Conflicts:
	lib/chef/knife/rackspace_server_create.rb