Fixed pinned dependency versions

These can cause real headaches if you have a different version of six or requests on your host machine.

This should fix the ``pkg_resources.DistributionNotFound`` error some people have been getting with the "wagtail start" command.
Merge remote-tracking branch 'upstream/master'