Reverted the role based approach in favor of deploying individual hosts.  While role based is ultimately the goal, there needs to be more some refactoring to make it useful.  For now we should use the host based approach.