Merge branch '182-osx-packaging-1' into 2249-windows-dep-workaround-4

diff --cc .travis.yml
index db9a8686689c144eb64c9e3eeb101ab9fbef6de5,136436806eda699fe03495bc64e68ec109485479..e9116a0d462c3a457a6c5667ecbdd7d4004f0208
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -6,8 -6,8 +6,7 @@@ before_install
    - sh -c set
    - git pull --depth=1000
    - python misc/build_helpers/show-tool-versions.py
-   - python -c "import os; print os.statvfs('.')"
  install:
 -  - pip install 'twisted>=0.13.0'
    - pip install 'coveralls==0.4.2'
  before_script: python setup.py build
  script: bin/tahoe @coverage run --branch --source=src/allmydata @tahoe --version-and-path debug trial --rterrors --reporter=timing