diff --git a/.npmignore b/.npmignore
new file mode 100644
index 00000000..1047a8b1
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,46 @@
+# Ignore docs files
+_gh_pages
+_site
+.ruby-version
+
+#ignore dist zip and gz files 
+/dist/jasny-bootstrap-*.zip
+/dist/jasny-bootstrap-*.tar.gz
+
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.zip
+*.vi
+*~
+
+# OS or Editor folders
+.DS_Store
+._*
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+*.sublime-project
+*.sublime-workspace
+.idea
+
+# Komodo
+*.komodoproject
+.komodotools
+
+# grunt-html-validation
+validation-status.json
+validation-report.json
+
+# Folders to ignore
+bower_components
+node_modules
diff --git a/.travis.yml b/.travis.yml
index dd45e2df..894a66d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,14 @@ env:
 matrix:
   fast_finish: true
 after_success:
-- npm config set git-tag-version=false
-- npm --no-git-tag-version version ${TRAVIS_TAG}
 - grunt dist
 - cd dist;
 - zip -r jasny-bootstrap-${TRAVIS_TAG}.zip *
 - tar -zcvf jasny-bootstrap-${TRAVIS_TAG}.tar.gz *
 - ls
 - cd ..
+- git reset --hard
+- npm --no-git-tag-version version ${TRAVIS_TAG}
 deploy:
   - provider: releases
     api_key: