Update .gitignore to ignore *.swp
Some cleanup/refactor on bucket/contact-set modules

Interface errors corrected