fixing whitespace, because my editor is strict :(
add .swp files to .gitignore
merge master changes