New branch for general build v1.24
Removed unnecessary .swp file
Removed unnecessary .swp file
Merge branch 'gb-1.24'
Adding a gitignore file.
Editing gitignore to ensure reproducible build
Fixing untracked files
Resolving conflicts