Removing the "update-site" script, since we're going to be hosting our

docs at Read The Docs.

docs/update-site.sh

@@ -1,6 +0,0 @@
-make html
-rm -rf ../../pecan.github.com/docs
-cp -r build/html ../../pecan.github.com/docs
-cd ../../pecan.github.com
-git commit -a -m "Updating documentation."
-git push

setup.py

@@ -37,7 +37,10 @@ requirements = [
 try:
     import json
 except:
-    requirements.append("simplejson >= 2.1.1")
+    try:
+        import simplejson
+    except:
+        requirements.append("simplejson >= 2.1.1")
 
 
 #