if --block-device is used dont use flocking, assume external system is handling locking
Merge pull request #196 from coryb/testing

if --block-device is used dont use flocking