Fix external source

This fixes the extra-index-url argument to pip-compile.  It also does a bit towards fixing the cram tests for the future branch (the obvious stuff), but I still have two tests failing.