Merge branch 'master' of https://github.com/mattbk/hack-grand-forks # Conflicts: # bin/gfk-publicstuff.R