Update .gitignore. Ignore build directory, *.swp and *~ files.
Merge branch 'build'