Fixes #587 - warn on missing ssh config, don't abort
Hide some test output
Merge branch '1.5'

Conflicts:
	docs/changelog.rst
Try adding CONTRIBUTING doc w/ link to real docs
Merge branch '1.5'
meh
Merge branch '1.5'
Maybe this?
Use Sphinx include for CONTRIBUTING
Derp
Language changes + addition to guidelines
Fixes bug part of #839
Merge branch '1.5'
Fix #843 by casting pool_size prior to min
Fix up pool_size sourcing logic re: @parallel
Merge branch '1.5'
Fix #844
Fix #844
Update 1.5 branch re #84 so it doesn't barf on Paramiko 1.10
Merge branch '1.5'

Conflicts:
	fabric/network.py