Derp fixes

.gitignore

@@ -1,7 +1,3 @@
 .grunt
 node_modules
-<<<<<<< HEAD
 components
-=======
-components
->>>>>>> master

Gruntfile.coffee

@@ -113,4 +113,4 @@ module.exports = (grunt) ->
         tasks: ["clean:css", "less", "cssmin", "usebanner:css"]
 
   grunt.registerTask "go", ["build", "connect", "open", "watch"]
-  grunt.registerTask "build", ["clean", "coffeelint", "coffee", "uglify", "usebanner:js", "less", "cssmin", "usebanner:css"]
+  grunt.registerTask "build", ["clean", "coffeelint", "coffee", "uglify", "usebanner:js", "less", "cssmin", "usebanner:css"]

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-switch",
   "description": "Unofficial bootstrap switch",
-  "version": "1.9.0",
+  "version": "2.0.0",
   "main": [
     "build/js/bootstrap-switch.js",
     "build/css/bootstrap3/bootstrap-switch.css"
@@ -12,4 +12,4 @@
   "dependencies": {
     "jquery": ">=1.9.0"
   }
-}
+}

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "nostalgiaz/bootstrap-switch",
   "description": "Unofficial bootstrap switch",
-  "version": "1.9.0",
+  "version": "2.0.0",
   "type": "component",
   "keywords": [
     "javaScript"

index.html

@@ -406,4 +406,4 @@ $('.radio1').on('switch-change', function () {
   <script src="docs/vendor/prism.js"></script>
   <script src="docs/index.js"></script>
   </body>
-</html>
+</html>