Merge branch 'master' into feature/ructe

.travis.yml

@@ -1,7 +1,9 @@
 language: rust
+cache: cargo
 services:
  - postgresql
 before_script:
+ - cargo update || true
  - echo "DATABASE_URL=postgres://localhost/rphotos" > .env
- - cargo install -v diesel_cli --no-default-features --features postgres
+ - cargo install -v diesel_cli --no-default-features --features postgres || true
  - $HOME/.cargo/bin/diesel setup

Cargo.toml

@@ -42,7 +42,7 @@ name = "setpassword"
 path = "src/setpassword.rs"
 
 [dependencies]
-nickel = ">= 0.8.1"
+nickel = "^0.8.1"
 nickel-jwt-session = "^0.4"
 env_logger = "*"
 log = "*"