diff --git a/.gitignore b/.gitignore
index 27247b1..56efb9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,22 @@
-.*.sw?
-pkg
-spec/fixtures
-!spec/fixtures/hiera.yaml
-!spec/fixtures/hieradata/*.yaml
-!spec/fixtures/manifests/site.pp
-.rspec_system
-.vagrant
-.bundle
-vendor
-.idea
-bin
-Gemfile.lock
-coverage
-Modulefile
-log
-junuit
-doc
+.*.sw[op]
+.metadata
 .yardoc
+.yardwarns
+*.iml
+/.bundle/
+/.idea/
+/.vagrant/
+/coverage/
+/bin/
+/doc/
+/Gemfile.local
+/Gemfile.lock
+/junit/
+/log/
+/pkg/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/
+/tmp/
+/vendor/
+/convert_report.txt
+.DS_Store