Merge and fix conflicts

README.markdown

@@ -25,7 +25,7 @@ Requirements
 You will need [Redis](http://redis.io), [Postgres](http://postgresql.org), python, pip and develpment libraries (for libpq, libxml2 and libxslt) to run the full setup.
 For example, on Ubuntu:
 
-    sudo aptitude install postgresql redis-server python-pip libpq-dev libxml2-dev libxslt-dev
+    sudo aptitude install postgresql redis-server python-pip libpq-dev libxml2-dev libxslt-dev python-dev
 
 Installing for development
 --------------------------

iati_datastore/iatilib/codelists/enum.py

@@ -16,6 +16,16 @@ def __init__(self, cls_, name, value, description):
     def __hash__(self): 
         return hash(self.value)
 
+    def __eq__(self, other):
+        if other is None:
+            return False
+        return self.value == other.value
+
+    def __ne__(self, other):
+        if other is None:
+            return True
+        return self.value != other.value
+
     def __reduce__(self):
         """Allow unpickling to return the symbol
         linked to the DeclEnum class."""