some old merge file got in a commit
readme for private directory
updated gitignore
merged settingsNonsensitive into settings.js, added settings example to the private folder
refactored chubby so that it points to the right path to the settings