Add pytest.mark.fixture_lock to prevent overlapping modification of globals. Fix the way layers are calculated.
Mark relevant fixtures as using the DBSession global. Fix browser test fixtures so as not to use conflicting fixtures.
Merge pull request #102 from ENCODE-DCC/fix-conflicting-tests

Fix conflicting tests