Put from_tree/to_tree back into a single function
Merge branch 'server-exprs' of github.com:cpcloud/blaze into server-exprs

Conflicts:
	blaze/serve/server.py