Merge Location class into BlockUsageLocator, and base AssetLocator on the merged class

Fix tests to reflect this.

Co-Author: Sarina Canelake <sarina@edx.org>
Co-Author: Calen Pennington <cale@edx.org>
Merge pull request #13 from edx/sarina/merge-locators-locations

WIP merge locators locations