Fix tests that broke with previous two commits

The previous two commits broke:

    1.  the routes for services because we changed them from
	"normal" to nested shallowly in church, and
    2.  the refactored shared error messages weren't propagated to the
	edit action for the user.

This fixes those problems so they work again.

Conflicts:
	app/views/users/edit.html.erb
Place more requirements on Church & Service

This makes sure that more attributes for the two models are required
so that we can't create values that are useless.
Test creation of Church with nested Service

These tests check that we can create a church with one nested service
as part of the form.