Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda