Parse urls in one regex w/ more consistency
Don't mix versions in same object:
VersionConflictError just has version as 2nd arg
Routines wanting to create an up-to-date locator shouldn't count on constructor to override version
Have urls.py fully parse locator url
Merge pull request #1416 from edx/dhm/regex_courseid

Parse locator url better