Use the Scala wrapper for System.getProperty that returns Option.
Use stdlib's Future.zip for parallel Future execution.

Stdlib Future's already have a .zip method that executes them both in
parallel.
Cons: A useless intermediate tuple.
Merge pull request #577 from LeifW/use_future_zip

Use future zip