Remove .settings
Merge http://github.com/LocalChum/UUIDResolver

Merge