include test requirements in dev.txt
Merge pull request #236 from magopian/dev-reqs-include-test-reqs

include test requirements in dev.txt
include test requirements in dev.txt (again)
Proper travis badge, with link to builds
Upgrading Elasticsearch (bug 1013874)