Merge in .settings path changes

Still getting the hang of doing merges so there are some extra redundant commits here...