Merge pull request #1069 from andrerod/dev

Fix caching bug
update to latest SDK version
Merge remote-tracking branch 'upstream/dev' into website_slot_create
Update recordings
remove shrinkwrap for now
Add slot swap
Merge branch 'website_slot_create' into website_slot_swap
Fix merging
Add slot in configurations
Fix recording
Fix merging
Merge branch 'website_slot_swap' into website_slot_config

Conflicts:
	test/recordings/cli.site.slot-tests.nock.js
Re-add webspace
Merge branch 'website_slot_swap' into website_slot_config
Removing validation and letting it fall through to the server
Merge pull request #98 from andrerod/website_slot_config

Website slot config
Merge pull request #97 from andrerod/website_slot_swap

Website slot swap
Add swap confirmation prompt
Adding slot to list and show
use quiet option in swap tests