add *.orig to .gitignore
more documentation
Merge branch '2.0.x' into gh-pages