Code review suggestions

Details on the versions checks being used:

JuliaLang/julia#25705 (544a5b8e39) => 0.7.0-DEV.3656
JuliaLang/julia#27095 (a209a45450) => 0.7.0-DEV.5183

.travis.yml

@@ -16,7 +16,15 @@ script:
   - |
     julia -e '
       VERSION >= v"0.7.0-DEV.3656" && using Pkg
-      VERSION >= v"0.7.0-DEV.5183" ? Pkg.instantiate() : Pkg.clone(pwd())
-      Pkg.build("Mocking"); Pkg.test("Mocking"; coverage=true)'
+      if VERSION >= v"0.7.0-DEV.5183"
+          Pkg.build(); Pkg.test(coverage=true)
+      else
+          Pkg.clone(pwd()); Pkg.build("Mocking"); Pkg.test("Mocking"; coverage=true)
+      end'
 after_success:
-  - julia -e 'cd(Pkg.dir("Mocking")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
+  - |
+    julia -e '
+      VERSION >= v"0.7.0-DEV.3656" && using Pkg
+      VERSION >= v"0.7.0-DEV.5183" || cd(Pkg.dir("Mocking"))
+      Pkg.add("Coverage"); using Coverage
+      Codecov.submit(process_folder())'

appveyor.yml

@@ -34,11 +34,16 @@ build_script:
       VERSION >= v\"0.7.0-DEV.3630\" && using InteractiveUtils; versioninfo();
       VERSION >= v\"0.7.0-DEV.3656\" && using Pkg;
       if VERSION >= v\"0.7.0-DEV.5183\"
-          Pkg.instantiate();
+          Pkg.build();
       else
-          Pkg.clone(pwd(), \"Mocking\");
-      end;
-      Pkg.build(\"Mocking\")"
+          Pkg.clone(pwd(), \"Mocking\"); Pkg.build(\"Mocking\");
+      end"
 
 test_script:
-  - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"Mocking\")"
+  - C:\projects\julia\bin\julia --check-bounds=yes -e "
+      VERSION >= v\"0.7.0-DEV.3656\" && using Pkg;
+      if VERSION >= v\"0.7.0-DEV.5183\"
+          Pkg.test();
+      else
+          Pkg.test(\"Mocking\");
+      end"