Replace puppet and chef with ansible; rename vagrant user to deploy; some minor improvements and cleanups.