Merging with Thomas.
Merge branch 'qa' of https://github.com/denimgroup/threadfix into qa
Edits to APIKeysTest to improve readability and overall structure.