Merge pull request #375 from solson/cleanups

cargo cache was messing up xargo/miri install

.travis.yml

@@ -8,7 +8,7 @@ before_script:
 - rustup target add i686-pc-windows-gnu
 - rustup target add i686-pc-windows-msvc
 - rustup component add rust-src
-- cargo install --git https://github.com/japaric/xargo.git
+- cargo install xargo || echo "skipping xargo install"
 - export RUST_SYSROOT=$HOME/rust
 script:
 - set -e
@@ -19,7 +19,7 @@ script:
   # Test plain miri
   cargo build --release --all-features &&
   cargo test --release --all-features --all &&
-  cargo install --all-features
+  cargo install --all-features --force
 - |
   # Test cargo miri
   cd cargo-miri-test &&

appveyor.yml

@@ -22,7 +22,7 @@ install:
     - rustc -V
     - cargo -V
     - rustup component add rust-src
-    - cargo install --git https://github.com/japaric/xargo.git
+    - cargo install xargo
     - cd xargo
     - set RUSTFLAGS=-Zalways-encode-mir -Zmir-emit-validate=1
     - xargo build