manually rebase orpsocv2 changes to svn revision 10 and tidy up
.gitignore: ignore build intermediate files