Fixed merge conflicts with master, with new release testing options.

.travis.yml

@@ -8,10 +8,12 @@ before_install:
   - sudo chown -R $USER /usr/local/include/google
 script:
   - cargo build --verbose --all
+  - cargo build --verbose --release --all
+  - cargo test --verbose --all
+  - cargo test --verbose --release --all
   - cargo fmt --all -- --check
   # No clippy until later...
   #- cargo clippy
-  - cargo test --verbose --all
 rust:
   - stable
   - beta