Merge remote-tracking branch 'upstream/master' into sg-zomg-are-we-done

Author: carols10cents

.travis.yml

@@ -1,5 +1,5 @@
 language: rust
-sudo: false
+sudo: required
 dist: trusty
 
 branches:

build.rs

@@ -8,6 +8,8 @@ use dotenv::dotenv;
 use std::env;
 
 fn main() {
+    println!("cargo:rerun-if-env-changed=TEST_DATABASE_URL");
+    println!("cargo:rerun-if-changed=build.rs");
     if env::var("PROFILE") == Ok("debug".into()) {
         let _ = dotenv();
         if let Ok(database_url) = env::var("TEST_DATABASE_URL") {