git ignore fix, provision fix
Merge origin/my-settings into my-settings