Fix some old relative imports to be absolute imports
Merge branch 'master' of github.com:ContinuumIO/conda