Detect mklink instead of looking at the Windows version
Remove an unused import
Merge branch 'master' of github.com:ContinuumIO/conda