Swift Mocking Block Location

- Enhancement: Add function to get the base path for the blocks in a vault
- Bug Fix: _get_block_path() to properly return the real block path (vault + "blocks" + block_id)
- Update all references to use the appropriate calls of the above

Note: This breaks tox as the swift driver adds "blocks/" to the block id before calling swift.
Merge branch 'master' into bugfix_swift-mocking-block-location

Conflicts:
	deuce/tests/db_mocking/swift_mocking/client.py
Moving file locations to match template repository
Merge branch 'master' into bugfix_swift-mocking-block-location
Merge branch 'master' into bugfix_swift-mocking-block-location
Updates to teardown in test_blocks.py
Updates to teardown in test_files.py
Support dash character for generating id
Merge pull request #59 from jc7998/file_locations

Moving file locations to match template repository
Merge remote-tracking branch 'main/master' into update_teardown
Add underscore to id generation
Swift Mocking Block Location

- Added logic to detect whether or not the 'blocks' portion of the path was already added and if so skip re-adding it.
Merge branch 'master' into bugfix_swift-mocking-block-location
Merge pull request #61 from jc7998/update_teardown

Update teardown method
Merge pull request #66 from BenjamenMeyer/bugfix_swift-mocking-block-location

Bugfix swift mocking block location
Merge branch 'master' into bugfix_get-file_wrong-content-type