Merge remote-tracking branch 'timothy-king/master'
authorTim King <taking@cs.nyu.edu>
Mon, 12 May 2014 17:10:16 +0000 (13:10 -0400)
committerTim King <taking@cs.nyu.edu>
Mon, 12 May 2014 17:10:16 +0000 (13:10 -0400)

Trivial merge