Infra 167

Changes to make dev easier and allow us to redirect to the ELB instead of back to "localhost" (where the server is running)