oops, put back the defaults for umbracoSettings
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Moves the JsNoCache to a real readable file instead of an embedded string (now an embedded file resource), updates it's logic to not append the hash to any dependencyhandler.axd request, fixes case sensitivity checking on the URLs, changes the cdf + umb version to be a nice shorter hash of the two.