Split out into two servers again

Apparently if one of the vhosts is spdy nginx will serve both of them as
spdy. Keeping them completely separate ensures that the http1 server
continues to serve as http1.
Move desktop hosts file to a file

There are no variables in it anymore so there is no need for it to be a
template.