Merge branch '3.0'

Conflicts:
	pavement.py

pavement.py

@@ -134,6 +134,7 @@ def pep8(options):
 def removepyc(options):
     sh('find . -type f -a \\( {0} \\) | xargs rm'.format(
         ' -o '.join("-name '{0}'".format(pat) for pat in PYCOMPILE_CACHES)))
+    sh('find . -type d -name "__pycache__" | xargs rm -r')
 
 
 @task