Auto merge of #16 - pcwalton:lockfile, r=glennw …

Add lockfile

r? @glennw

bors-servo committed Mar 3, 2016