updates to separate out public URL from internal/admin URL
Merge pull request #2 from craiganderson/stable/havana

updates to separate out public URL from internal/admin URL