Updating site source
Update site source
Test on 2.5 but allow failure; test with or without opentrep
Update gitignore
Change order
Merge branch 'public' into pypy