Added swp files to the gitignore
Merge gitignore changes from each branch
Merge commit '204925e' into beam