Blargh!
Merge pull request #45 from methnen/flock

Changing to an action because it's more appropriate.