Move chef-client role to base role
Use user cookbook from supermarket and update git locations