Remove shim usage to allow loading under r.js

src/vs/base/common/marked/marked.js

@@ -3,16 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-require.config({
-	shim: {
-		'vs/base/common/marked/raw.marked': {
-			exports: function () {
-				return this.marked;
-			}
-		}
-	}
-});
-
 define(['./raw.marked'], function (marked) {
 	return {
 		marked: marked

src/vs/base/common/marked/raw.marked.js

@@ -1265,7 +1265,9 @@ marked.inlineLexer = InlineLexer.output;
 marked.parse = marked;
 
 // TODO MonacoChange: we have our own way of defining modules
-this.marked = marked;
+define([], function() {
+  return marked;
+});
 //if (typeof module !== 'undefined' && typeof exports === 'object') {
 //  module.exports = marked;
 //} else if (typeof define === 'function' && define.amd) {