Merge remote-tracking branch 'upstream/master'

Author: Markus Bucher

.autotest

@@ -1,12 +1,9 @@
-spec/ldap.yml
+*~
+*.swp
 .rvmrc
-*.gemspec
 pkg/
-*.swp
-html/
 doc/
 publish/
-coverage/
-coverage.info
-.rake_tasks~
 Gemfile.lock
+.bundle
+bin/

.gitignore

@@ -0,0 +1,20 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - 'pkg/**/*'
+
+Style/ExtraSpacing:
+  Enabled: false
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma