Merge branch 'master' into default-namespace

Conflicts:
	template.js

root/Gruntfile.js

@@ -25,6 +25,7 @@ module.exports = function(grunt) {
     amberc: {
       options: {
         amber_dir: path.join(__dirname, "bower_components", "amber"),
+        library_dirs: ['src'],
         closure_jar: ''
       },
       test_runner: {
@@ -35,7 +36,6 @@ module.exports = function(grunt) {
           'SUnit',
           '{%= name %}-Tests' /* add other test packages here */
         ],
-        options: { library_dirs: ['src'] },
         main_class: 'NodeTestRunner',
         output_name: 'test_runner'
       }

template.js

@@ -69,7 +69,7 @@ exports.template = function(grunt, init, done) {
         value = 'amber-' + remembered.name.toLowerCase();
         done(null, value);
       },
-      validator: /^[a-z][a-z0-9\-]*$/,
+      validator: /^[a-z][a-z0-9/\-]*$/,
       warning: 'Only lowercase letters, numbers, and - are allowed in namespaces!'
     },
     init.prompt('version'),
@@ -99,7 +99,7 @@ exports.template = function(grunt, init, done) {
       "grunt": "~0.4.0",
       "grunt-execute": "~0.2.1",
       "grunt-contrib-clean": "~0.5.0",
-      "amber-dev": "0.0.3"
+      "amber-dev": "~0.1.0"
     };
     props.node_version = '>= 0.8.0';
     props.scripts = {