Revert "Stopped tracking environment specific directories"

This reverts commit 2a20739c978dbfb75ac20f3e7dfa519b3f35d7b2.
Revert "Stopped tracking .settings directory"

This reverts commit 286334d47b3733bb4a9708ffebe26ce4c819483e.