diff --git a/.gitignore b/.gitignore
index 044361079..8741ad4a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+### Dot files ###
+.*
+
 ### Logs ###
 logs
 *.log
@@ -13,6 +16,9 @@ pids
 ### NPM modules ###
 node_modules
 
+### Spec and test coverage ###
+spec
+
 ### Test coverage ###
 coverage
 
diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index 262d171de..000000000
--- a/.npmignore
+++ /dev/null
@@ -1,28 +0,0 @@
-### Dot files ###
-.*
-
-### Git ###
-!/.gitignore
-!/.gitmodules
-
-### Logs ###
-logs
-*.log
-
-### Runtime data ###
-pids
-*.pid
-*.seed
-
-### NPM modules ###
-node_modules
-
-### Travis ###
-!/.travis.yml
-
-### Spec and test coverage ###
-spec
-
-### Custom ignores ###
-config.js
-.idea