Test class populated with blocks and files
Merge branch 'master' into stats_pop_vault
Modify assign blocks to assign specific blocks to specific files. Same with finalize files
Reflect changes made to self.files. self.files now contains named tuples with Id and Url
Test vault statistics for a populated vault
Deuce Context: Transaction-ID

- Moves the Transaction-ID to the Deuce Context
Deuce Context - Transaction-ID

- Update the standard response headers with the Transaction-ID
Deuce Context - Transaction-ID

- Use the hook to set the transaction id in the response headers and only set them otherwise when we call abort()
Merge branch 'master' into enhancement_deuce_context_transaction_id

Conflicts:
	deuce/controllers/blocks.py
	deuce/controllers/fileblocks.py
	deuce/controllers/files.py
	deuce/controllers/vault.py
Merged branch
Merge branch 'master' into enhancement_deuce_context_transaction_id
Deuce Context - Transaction-ID

JIRA: CBDEUCE-152
- Bug Fix: Directly use the duece.common.context.Context's request_id variable instead of trying to rely on decode
- Enhancement: Rename deuce.context.request_id to deuce.context.transaction so we can have clarity with the internal request_id variable of the object stored there
Deuce Context - Transaction-ID

JIRA: CBDEUCE-152
- Removing line that crept back in; it's taken care of by the hook
Merge pull request #75 from jc7998/stats_pop_vault

Test Vault Statistics of a Populated Vault
Merge pull request #78 from BenjamenMeyer/enhancement_deuce_context_transaction_id

Deuce Context: Transaction-ID
Merge branch 'master' into enhancement_deuce_context_swift

Conflicts:
	deuce/controllers/blocks.py
	deuce/controllers/fileblocks.py
	deuce/controllers/files.py
	deuce/controllers/vault.py
	deuce/hooks/openstackhook.py
	deuce/tests/__init__.py
Merge branch 'enhancement_deuce_context_swift' into enhancement_deuce_context_swift_full

Conflicts:
	deuce/controllers/blocks.py
	deuce/controllers/fileblocks.py
	deuce/controllers/files.py
	deuce/controllers/vault.py
Deuce Context - OpenStack Swift

JIRA: CBDEUCE-149
- Bug Fix: Several places incorrectly assigned the auth_token in the context
Merge branch 'enhancement_deuce_context_swift_full' into enhancement_test_context_unified

Conflicts:
	deuce/tests/test_swift_storage_driver.py