diff --git a/packages/flutter_tools/lib/executable.dart b/packages/flutter_tools/lib/executable.dart
index 86b8f089a8a..e85a34f797c 100644
--- a/packages/flutter_tools/lib/executable.dart
+++ b/packages/flutter_tools/lib/executable.dart
@@ -32,10 +32,11 @@ Future main(List<String> args) async {
   // This level can be adjusted by users through the `--verbose` option.
   Logger.root.level = Level.WARNING;
   Logger.root.onRecord.listen((LogRecord record) {
+    String level = record.level.name.toLowerCase();
     if (record.level >= Level.WARNING) {
-      stderr.writeln(record.message);
+      stderr.writeln('$level: ${record.message}');
     } else {
-      print(record.message);
+      print('$level: ${record.message}');
     }
     if (record.error != null)
       stderr.writeln(record.error);
diff --git a/packages/flutter_tools/lib/src/commands/flutter_command_runner.dart b/packages/flutter_tools/lib/src/commands/flutter_command_runner.dart
index 6d54a3b84e4..36b39be21c8 100644
--- a/packages/flutter_tools/lib/src/commands/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/commands/flutter_command_runner.dart
@@ -49,7 +49,7 @@ class FlutterCommandRunner extends CommandRunner {
     argParser.addFlag('local-build',
         negatable: false,
         help:
-            'Automatically detect your engine src directory from an overridden Flutter package.'
+            'Automatically detect your engine src directory from an overridden Flutter package. '
             'Useful if you are building Flutter locally and are using a dependency_override for'
             'the Flutter package that points to your engine src directory.');
     argParser.addOption('engine-src-path', hide: true,
diff --git a/packages/flutter_tools/lib/src/commands/init.dart b/packages/flutter_tools/lib/src/commands/init.dart
index 756dc9562bb..ed1db5ba7ee 100644
--- a/packages/flutter_tools/lib/src/commands/init.dart
+++ b/packages/flutter_tools/lib/src/commands/init.dart
@@ -89,6 +89,7 @@ abstract class Template {
 class FlutterSimpleTemplate extends Template {
   FlutterSimpleTemplate() : super('flutter-simple', 'A minimal Flutter project.') {
     files['.gitignore'] = _gitignore;
+    files['flutter.yaml'] = _flutterYaml;
     files['pubspec.yaml'] = _pubspec;
     files['README.md'] = _readme;
     files['lib/main.dart'] = _libMain;
@@ -98,9 +99,8 @@ class FlutterSimpleTemplate extends Template {
 String _normalizeProjectName(String name) {
   name = name.replaceAll('-', '_').replaceAll(' ', '_');
   // Strip any extension (like .dart).
-  if (name.contains('.')) {
+  if (name.contains('.'))
     name = name.substring(0, name.indexOf('.'));
-  }
   return name;
 }
 
@@ -134,6 +134,12 @@ dev_dependencies:
   sky_tools: any
 ''';
 
+const String _flutterYaml = r'''
+name: {{projectName}}
+material-design-icons:
+  - name: content/add
+''';
+
 const String _libMain = r'''
 import 'package:flutter/material.dart';
 
diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml
index 37c85beb092..23fa0e70451 100644
--- a/packages/flutter_tools/pubspec.yaml
+++ b/packages/flutter_tools/pubspec.yaml
@@ -28,7 +28,7 @@ dependencies:
 # See also https://github.com/dart-lang/pub/issues/1356
 
 dev_dependencies:
-  mockito: "^0.10.1"
+  mockito: ^0.10.1
 
 # Add the bin/sky_tools.dart script to the scripts pub installs.
 executables: