Fixed some things post-merge

Author: chamilton-ccn

setup.py

@@ -26,11 +26,7 @@
 
 
 here = os.path.abspath(os.path.dirname(__file__))
-<<<<<<< HEAD
-exec(compile(open(os.path.join(here, 'sqlalchemy_pervasive', '_version.py')).read(), os.path.join(here, 'sqlalchemy_pervasive', '_version.py'), 'exec'))
-=======
 exec(open(os.path.join(here, 'sqlalchemy_pervasive', '_version.py')).read())
->>>>>>> 3c1928b5b5693898f30e8b6e0ae4e6f57a5bf941
 
 README = open(os.path.join(here, 'README.rst')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()

sqlalchemy_pervasive/_version.py

@@ -1,5 +1 @@
-<<<<<<< HEAD
 __version__ = '0.1.3'
-=======
-__version__ = '0.2.1'
->>>>>>> 3c1928b5b5693898f30e8b6e0ae4e6f57a5bf941