Adding file locking
Merge branch 'master' into file-locking

Conflicts:
	src/JamesMoss/Flywheel/Repository.php
Marking locking test as incomplete
Merge branch 'file-locking'