Move locale back to root + change settings
Merge pull request #237 from gannetson/locale-motion

Move locale back to root + change settings