Merge api

Move the api to the same host as is serving the website to simplify authentication.