Fixed most parse errors for runtests.sh
Did a few things to resolve s/r r/r conflicts
modifed gitignore
Removing autogenerated files from repo