Update knife-joyent.gemspec
Release 0.4.6 added "knife joyent server pricing"
Merge branch 'patch-1' of git://github.com/dereklwood/knife-joyent into dereklwood-patch-1
Updated gemspec to use newer versions of chef and fog
Cleans up access to package information #75
Cleans up access to pricing information - pricing cmd #75
Release 0.4.7 bumped fog and chef versions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	knife-joyent.gemspec
	lib/chef/knife/joyent_server_pricing.rb