Merge test-requirements.txt with requirements.txt

Since our python application is essentially a test runner we don't
need 2 different requirements.  All the libraries we use is for
testing.

Change-Id: I320ac44e656ad9e3ab0e0aa18c4e8b4119504863
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>