Add travis_retry to sudo apt-get install commands in .travis.yml
merge dev_5_0 -D org: PR 868 (5.0.3: CLI documentation)
merge dev_5_0 -D org: PR 870 (New search docs)
merge dev_5_0 -D org: PR 875 (Expand setup.py test/py.test options description)
merge dev_5_0 -D org: PR 884 (Add travis_retry to sudo apt-get install commands in .travis.yml)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 885 sbesson 'Update auto-generated properties' (status: failure)
  # PR 881 joshmoore 'Adv config example' (label: exclude)
Updating c6247bb..afe4ce5
Merged PRs (fast-forward):
  # PR 877 rleigh-dundee 'Update recommended PostgreSQL version to 9.2 for float bug fix'
  # PR 866 bpindelski 'Document client requirements for in-place import on Windows.'
  # PR 873 mtbc 'add note about consequences of "damaging" in-place import files'

Merged PRs:
  # PR 868 sbesson '5.0.3: CLI documentation'
  # PR 870 joshmoore 'New search docs'
  # PR 875 sbesson 'Expand setup.py test/py.test options description'
  # PR 884 sbesson 'Add travis_retry to sudo apt-get install commands in .travis.yml'

Generated by OME-5.0-merge-push#119 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/119/)