BRS: Updating gitignore to, well, ignore .orig files
BRS: Resolving weird build issue