diff --git a/.gitignore b/.gitignore
index 5287262..fcc0227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,7 @@
 testapp/tt.py
 
 *.pyc
-<<<<<<< HEAD
-=======
 
-testapp/tt2.py
->>>>>>> v1.1
+Django_Select2.egg-info
+dist
+build
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..f760280
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2012, Nirupam Biswas
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..6243555
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+include *.txt
+recursive-include django_select2/static *.*
+recursive-exclude django_select2/static .DS_Store
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..e9c131b
--- /dev/null
+++ b/README
@@ -0,0 +1,33 @@
+Django-Select2
+==============
+
+This is a [Django](https://www.djangoproject.com/) integration of [Select2](http://ivaynberg.github.com/select2/).
+
+The app includes Select2 driven Django Widgets and Form Fields.
+
+More details can be found on my blog at - [http://blog.applegrew.com/2012/08/django-select2/](http://blog.applegrew.com/2012/08/django-select2/).
+
+External Dependencies
+=====================
+
+* Django - This is obvious.
+* jQuery - This is not included in the package since it is expected that in most scenarios this would already be available.
+
+Example Application
+===================
+Please checkout `testapp` application. This application is used to manually test the functionalities of this component. This also serves as a good example.
+
+You need only django 1.4 or above to run that.
+
+Changelog Summary
+=================
+
+### v2.0.1
+
+* Auto id registration fixes.
+
+### v2.0
+
+* Mostly major bug fixes in code and design. The changes were many, raising the possibility of backward incompatibility. However, the backward incompatibility would be subtle.
+
+* Auto fields (sub-classes of AutoViewFieldMixin) now accepts `auto_id` parameter. This can be used to provide custom id for the field. The default is 'module.field_class_name'. Ideally only the first instance of an auto field is registered. This parameter can be used to force registration of additional instances by passing a unique value.
diff --git a/README.md b/README.md
index e6a473a..e9c131b 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,12 @@ You need only django 1.4 or above to run that.
 Changelog Summary
 =================
 
+### v2.0.1
+
+* Auto id registration fixes.
+
 ### v2.0
 
-* Mostly major bug fixes in code and design. The changes were many, raising the possibility of backward incompatibilty. However, the backward incompatibilty would be subtle.
+* Mostly major bug fixes in code and design. The changes were many, raising the possibility of backward incompatibility. However, the backward incompatibility would be subtle.
 
 * Auto fields (sub-classes of AutoViewFieldMixin) now accepts `auto_id` parameter. This can be used to provide custom id for the field. The default is 'module.field_class_name'. Ideally only the first instance of an auto field is registered. This parameter can be used to force registration of additional instances by passing a unique value.
diff --git a/setup.py b/setup.py
index 6c59951..8787a2d 100644
--- a/setup.py
+++ b/setup.py
@@ -102,11 +102,10 @@ def find_package_data(
                 out.setdefault(package, []).append(prefix+name)
     return out
 
-
 PACKAGE = "django_select2"
 NAME = "Django-Select2"
 DESCRIPTION = "Select2 option fields for Django"
-AUTHOR = "AppleGrew"
+AUTHOR = "Nirupam Biswas"
 AUTHOR_EMAIL = "admin@applegrew.com"
 URL = "https://github.com/applegrew/django-select2"
 VERSION = __import__(PACKAGE).__version__
@@ -119,13 +118,14 @@ setup(
     long_description=read("README.md"),
     author=AUTHOR,
     author_email=AUTHOR_EMAIL,
-    license="MIT",
+    license="LICENSE.txt",
     url=URL,
-    packages=find_packages(exclude=["tests.*", "tests"]),
-    package_data=find_package_data(PACKAGE, only_in_packages=False),
+    packages=[PACKAGE],
+    package_data=find_package_data(),
+    exclude_package_data={ '': standard_exclude },
     include_package_data=True,
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
@@ -133,4 +133,7 @@ setup(
         "Programming Language :: Python",
         "Framework :: Django",
     ],
+    install_requires=[
+        "Django",
+    ],
 )