Merge branch 'jonbhanson-master' into v1.0.0

Author: LuisThein

.gitignore

@@ -8,7 +8,6 @@
 .buildlog/
 .history
 .svn/
-resources/
 
 # IntelliJ related
 *.iml
@@ -25,10 +24,12 @@ resources/
 **/doc/api/
 .dart_tool/
 .flutter-plugins
+.flutter-plugins-dependencies
 .packages
 .pub-cache/
 .pub/
 build/
+pubspec.lock
 
 # Android related
 **/android/**/gradle-wrapper.jar
@@ -58,6 +59,7 @@ build/
 **/ios/.generated/
 **/ios/Flutter/App.framework
 **/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
 **/ios/Flutter/Generated.xcconfig
 **/ios/Flutter/app.flx
 **/ios/Flutter/app.zip
@@ -71,6 +73,3 @@ build/
 !**/ios/**/default.mode2v3
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-example/.flutter-plugins-dependencies
-example/ios/Flutter/Flutter.podspec