update branch from master, fix merge conflicts

.gitignore

@@ -1,24 +1,23 @@
-#This file is generated by ModuleSync, do not edit.
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-log/
-junit/
-.vagrant/
+# This file is generated by ModuleSync, do not edit.
+*.iml
+.*.sw[op]
+.DS_Store
 .bundle/
-coverage/
-log/
 .idea/
 .metadata
-*.iml
-.*.sw[op]
+.vagrant/
 .yardoc
 .yardwarns
-.DS_Store
+Gemfile.local
+Gemfile.lock
+bin/
+coverage/
+doc/
+junit/
+log/
+pkg/
+spec/fixtures/manifests/
+spec/fixtures/modules/
 tmp/
 vendor/
-doc/