dont reference settings_local ever
Merge branch 'master' of github.com:reallocate/reallocate
Merge branch 'master' of github.com:reallocate/reallocate
adding more info to the readme about settings_local
fixing merge conflict