add *.swp to gitignore
Add location to a user via a postal code.
Merge remote-tracking branch 'upstream/master'
merge with mendicant