We don't want --clean since we have patches that need to stay
Templates: remove some duplicates
Various: update against templates
Enable FxOS 1.3
Delete an unwanted file