Update CHANGELOG.md, package.json, and npmignore

Author: isteven

.npmignore

@@ -5,3 +5,4 @@ CHANGELOG.md
 package.json
 README.md
 screenshot.png
+/doc

CHANGELOG.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ### v3.0.0
 ##### Added / Updated
 - Customized text on helper elements
@@ -15,8 +14,6 @@
 - input-model is now static (not dynamically updated), hence why we need output-model. On the plus side, you now can re-use the input model where necessary.
 - default-label is deprecated. Custom text and translations can be done using the translation attribute.
 
-=======
->>>>>>> 2ec1448096771715822b3329e9ef566d598a8f5d
 ### v2.0.2
 ##### Added / Updated
 - Bring back CSS into bower.json.

package.json

@@ -1,10 +1,10 @@
 {
     "name": "isteven-angular-multiselect",
-    "version": "v2.0.2",
+    "version": "v3.0.0",
     "description": "A multi select dropdown directive for AngularJS",
     "main": [
-        "angular-multi-select.js",
-        "angular-multi-select.css"
+        "isteven-multi-select.js",
+        "isteven-multi-select.css"
     ],
     "repository": {
         "type": "git",