fix tests to account for https://github.com/scrapy/w3lib/pull/23
Merge pull request #812 from kmike/fix-w3lib-trunk

fix tests to account for https://github.com/scrapy/w3lib/pull/23
adding some xpath tips to selectors docs
renamed UserTimeoutError and ServerTimeouterror #583
Merge pull request #815 from nramirezuy/retry_timeout-583

renamed UserTimeoutError and ServerTimeouterror #583
improved explanations, clarified blog post as source, added link for XPath string functions in the spec
removes weird indentation in the shell results
Merge pull request #814 from eliasdorneles/adding-some-xpath-tips

Adding some xpath tips to selectors docs
PY3: use MutableMapping instead of DictMixin
items: Use BaseItem.__hash__ and six.add_metaclass decorator
pytest 2.6.0 is on pypi now
Add tox env for python 3.4
Merge branch 'py3-port'
Update shell.rst typo

There was a typo. 
"start" was mistyped as "star"
Merge pull request #820 from lisimia/patch-1

Update shell.rst typo
move tests under root dir
move tests requirements under tests dir
use pytest.ini to enable twisted plugin
fix Twisted package name
Fix bench command