Fix requirements, split out test requirements
Merge pull request #7 from paulfurley/fix-requirements

Fix requirements, split out test requirements