Merge branch 'fredj/master'

setup.py

@@ -40,7 +40,8 @@ install_requires.extend([
     "sqlalchemy",
     "anyjson",
     "carrot>=0.10.5",
-    "pyparsing"])
+    "pyparsing",
+    "timer2"])
 
 py_version = sys.version_info
 if sys.version_info < (2, 6):