diff --git a/examples b/examples
index 9b0c8c32..4b6ddf48 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit 9b0c8c32ccc7e7cd1d937874c66a92c66bf745f1
+Subproject commit 4b6ddf489635f332d4871fd4045634a49ad2aac7
diff --git a/platformio/commands/init.py b/platformio/commands/init.py
index 9ab78e11..3d271f03 100644
--- a/platformio/commands/init.py
+++ b/platformio/commands/init.py
@@ -77,10 +77,10 @@ def cli(ctx,  # pylint: disable=R0913
             fg="yellow")
         click.echo("")
 
-    click.echo("The next files/directories will be created in %s" %
+    click.echo("The next files/directories have been created in %s" %
                click.style(
                    project_dir, fg="cyan"))
-    click.echo("%s - Project Configuration File. |-> PLEASE EDIT ME <-|" %
+    click.echo("%s - Project Configuration File" %
                click.style(
                    "platformio.ini", fg="cyan"))
     click.echo("%s - Put your source files here" % click.style(
@@ -89,10 +89,6 @@ def cli(ctx,  # pylint: disable=R0913
                click.style(
                    "lib", fg="cyan"))
 
-    if (app.get_setting("enable_prompts") and
-            not click.confirm("Do you want to continue?")):
-        raise exception.AbortedByUser()
-
     init_base_project(project_dir)
 
     if board:
@@ -276,10 +272,21 @@ def init_ci_conf(project_dir):
 
 
 def init_cvs_ignore(project_dir):
-    if isfile(join(project_dir, ".gitignore")):
-        return
-    with open(join(project_dir, ".gitignore"), "w") as f:
-        f.write(".pioenvs")
+    ignore_path = join(project_dir, ".gitignore")
+    default = [
+        ".pioenvs\n",
+        ".piolibdeps\n"
+    ]
+    current = []
+    if isfile(ignore_path):
+        with open(ignore_path) as fp:
+            current = fp.readlines()
+    print 13, current
+    for d in default:
+        if d not in current:
+            current.append(d)
+    with open(ignore_path, "w") as fp:
+        fp.writelines(current)
 
 
 def fill_project_envs(  # pylint: disable=too-many-arguments,too-many-locals
diff --git a/platformio/projectconftpl.ini b/platformio/projectconftpl.ini
index 0e9de3f9..c4b4ae30 100644
--- a/platformio/projectconftpl.ini
+++ b/platformio/projectconftpl.ini
@@ -1,6 +1,10 @@
 #
 # PlatformIO Project Configuration File
 #
-# Please make sure to read documentation with examples first
+#   Build options: build flags, source filter, extra scripting
+#   Upload options: custom port, speed and extra flags
+#   Library options: dependencies, extra library storages
+#
+# Please visit documentation for the other options and examples
 # http://docs.platformio.org/en/stable/projectconf.html
-#
\ No newline at end of file
+#