Merge lp:~soren/riakalchemy/allow-pip-install into lp:riakalchemy

[Soren Hansen]

Move version back into setup.py to allow setup.py to run when riak is not installed yet.

=== modified file 'riakalchemy/__init__.py'
--- riakalchemy/__init__.py	2011-11-25 22:35:05 +0000
+++ riakalchemy/__init__.py	2011-11-30 21:46:27 +0000
@@ -1,5 +1,3 @@
-__version__ = '0.1a4'
-
 import model
 from model import NoSuchObjectError
 
 
=== modified file 'setup.py'
--- setup.py	2011-11-25 22:35:05 +0000
+++ setup.py	2011-11-30 21:46:27 +0000
@@ -1,11 +1,10 @@
 #!/usr/bin/python
 
-import riakalchemy
 from setuptools import setup
 
 setup(
     name='riakalchemy',
-    version=riakalchemy.__version__,
+    version='0.1a4',
     description='Object Mapper for Riak',
     author='Soren Hansen',
     license='LGPL',