Make the Capfile a bit slimmer

Remove unused Puppet stuff
Remove the deploy and service namespaces
Deploy now updates everything and restarts