Fix settingsLoader

Merge local and global settings object instead of just taking care of contentExtension.
Remove unnecessary fs.exists call.
Merge branch 'settingsLoader' of github.com:DieBuche/woods

Conflicts:
	lib/Site.js
Fix botched merge.
Merge pull request #25 from DieBuche/readIfExists2

Remove additional unnecessary fs.exists call