diff --git a/CHANGES b/CHANGES
index 87be49c..2d0f496 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,4 +6,4 @@ Here you can see the full list of changes between each Flask-Social release.
 Version 0.1.0
 -------------
 
-Released on ...
\ No newline at end of file
+Initial release
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index bbf6b57..2b1a4f0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2012 by Matt Wright
+Copyright (C) 2012 by Matthew Wright
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 
diff --git a/README b/README
deleted file mode 100644
index 4c4135d..0000000
--- a/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Flask-Social
-============
-
-Oauth provider login and APIs for use with Flask-Security.
-
-Documentation: http://packages.python.org/Flask-Social/
-
-Example Application: http://flask-social-example.herokuapp.com
\ No newline at end of file
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..6ca5f9d
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,15 @@
+Flask-Social
+============
+
+Oauth provider login and APIs for use with 
+`Flask-Security <http://packages.python.org/Flask-Security/>`_
+
+Resources
+---------
+
+- `Documentation <http://packages.python.org/Flask-Social/>`_
+- `Issue Tracker <http://github.com/mattupstate/flask-social/issues>`_
+- `Code <http://github.com/mattupstate/flask-social/>`_
+- `Development Version
+  <http://github.com/mattupstate/flask-rq/zipball/develop#egg=Flask-Social-dev>`_
+- `Example Application <http://flask-social-example.herokuapp.com/>`_
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index 1f8eae2..6d04aa0 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,17 +1,4 @@
-Flask-Social
-==============
-
-.. module:: flask_social
-
-Flask-Social is a Flask extension that aims to add simple OAuth provider 
-<<<<<<< HEAD
-integration for `Flask-Security <http://packages.python.org/Flask-Security/>`_. 
-An example application is located at 
-`http://flask-social-example.herokuapp.com <http://flask-social-example.herokuapp.com/>`_. 
-=======
-integration for Flask-Security. Checkout the `example application <http://flask-social-example.herokuapp.com/>`_ 
-to perhaps get a better sense of what Flask-Social can do for you.
->>>>>>> master
+.. include:: ../README.rst
 
 
 Contents
@@ -348,6 +335,7 @@ signals in your code.
 
 Changelog
 =========
+
 .. toctree::
    :maxdepth: 2
 
diff --git a/setup.py b/setup.py
index 3e068fa..24dda11 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,18 @@
 """
 Flask-Social
---------------
+============
 
-Simple OAuth provider integration for Flask-Security.
+Oauth provider login and APIs for use with
+`Flask-Security <http://packages.python.org/Flask-Security/>`_
 
-Links
-`````
+Resources
+---------
 
-* `development version
-  <https://github.com/mattupstate/flask-social/raw/develop#egg=Flask-Social-dev>`_
+- `Documentation <http://packages.python.org/Flask-Social/>`_
+- `Issue Tracker <http://github.com/mattupstate/flask-social/issues>`_
+- `Code <http://github.com/mattupstate/flask-social/>`_
+- `Development Version
+  <http://github.com/mattupstate/flask-rq/zipball/develop#egg=Flask-Social-dev>`_
 
 """
 from setuptools import setup