add test to ensure we're testing the proper branching of landings
Fixed merge conflict
Merge pull request #238 from 18F/test-view-split

Add test to ensure we're testing proper branching of agency landing page templates