updating to latest images
hack to prevent failed remounting on joyent centos images
update joyent keyfile field to data resource
match only /data
remove commented code
trying to make the names a bit more consistent and disambiguous
latest ubuntu 12 image
Merge branch 'develop' into feature/resource-joyent
nomenclature update
Merge branch 'develop' into feature/resource-joyent

Conflicts:
	provisioner/worker/plugins/providers/fog_provider/lib/fog_provider/joyent.rb
Merge pull request #513 from continuuity/feature/resource-joyent

Feature/resource joyent