Added test for verify_file and renamed a bunch of stuff in sync.py for
consistency