Fix settingsLoader

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

Conflicts:
	lib/Site.js