Merge pull request #7 from gregington/master

Made locking on strips consistent.

This needs a little bit of work to repair the massive performance regression;  coming soon.
Fix performance regression introduced by gregington

Tada!
Remove potential raciness caused by possibly not having the right collection

Also, snarky comments