fix bug 147, add .swp to gitignore
Merge branch 'bug147'