Merge branch 'master' of github.com:adamwgoldberg/adam-goldberg