Combine marketing site tests into a single file
Merge pull request #44 from edx/zoldak/single-mktg-test

Combine marketing site tests into a single file