Make main use the shared classes that I split out.

Also fix some indentation things, and show the dev message
even when running in the local GAE testing environment.