In general this looks good to me. CI is showing two failures. One seems to be unrelated and probably due to a conda issue (will likely fix itself when we next run CI)

The other appears to be a flake8 issue

distributed/tests/test_resources.py:283:5: E123 closing bracket does not match indentation of opening bracket's line

(you can see this by clicking "Details" next to the travis-ci line above and then looking at the last line that says LINT=true)

You can also verify flake8 locally by running

$ flake8 distributed

Much like how you would run py.test

$ py.test distributed

Python 3.5 is unhappy with pytest 4.1.1, looks like pytest 3.8.1 is the last one to have a satisfiable python >=3.5,<3.6.0a0.

Short term I recommend that we just unpin pytest and let the solver figure it out.

This looks good to me. Merging. Thanks @beberg !

Also, I notice that this is your first code contribution to this repository. Welcome!