Cannot use generic-user.yaml, copy/paste in
Un-do all use of generic-user.yaml and remove it.

This was a rather experimental way to try and create some generic
templates in Heat. But the AllowedResources can only refer to resources
inside the template itself, so this is useless.
Fix swift Metadata section.
Merge github.com:SpamapS/templates

Conflicts:
	generic-user.yaml