Updated gitignore to account for files generated by other branch
Merge branch 'master' into processing