Test PR. Fixes problem with Travis conda requirements

Could be a problem with my local install; want to see if Travis will pass
this. This is the current choderalab/master, plus an empty file, so if it
doesn't pass the tests then the question becomes version numbers and such.

Currently implemented stuff *does* fix a problem on Travis, so probably worth merging. However, my local problems remain.