Merge pull request #35 from jeffakolb/master

Foursquare-related changes: