Removed a lot of duplication.

This is now a much simpler deployment for our live/beta hosts.