reorganizing extension directories again

.gitignore

@@ -4,5 +4,5 @@ src/brackets.min.css
 
 # ignore everything in the user extension directory EXCEPT the README
 # (so that the directory is non-empty and can be in git)
-src/extensions-user/*
-!src/extensions-user/README
+src/extensions/user/*
+!src/extensions/user/README

src/ExtensionLoader.js

@@ -29,7 +29,7 @@ define(function (coreRequire, exports, module) {
 			// load extensions
 			extensionRequire = brackets.libRequire.config({
 			    context: extensionDirs[i],
-			    baseUrl: "extensions-default/" + extensionDirs[i]
+			    baseUrl: "extensions/default/" + extensionDirs[i]
 			});
 
 			console.log("starting to load " + extensionDirs[i]);
@@ -40,7 +40,7 @@ define(function (coreRequire, exports, module) {
     }
 
 	// TODO: get the directories from NativeFileSystem rather than the low-level filesystem
-	var extensionPath = window.location.pathname.substr(0, window.location.pathname.lastIndexOf("/")) + "/extensions-default";
+	var extensionPath = window.location.pathname.substr(0, window.location.pathname.lastIndexOf("/")) + "/extensions/default";
 	console.log("the extension path is: " + extensionPath);
 
     function startLoading() {