Fix merging
Add slot in configurations
Fix recording
Merge branch 'website_slot_swap' into website_slot_config

Conflicts:
	test/recordings/cli.site.slot-tests.nock.js
Merge branch 'website_slot_swap' into website_slot_config
Merge pull request #98 from andrerod/website_slot_config

Website slot config