add kasia to changelog
add KAsia to authors
Solve fixture ordering when loading plugins from conftest

Conftests are plugins with a location attached to them while other
plugins do not have a location.  When ordering fixturedefs those from
plugins without a location need to be listed first.
Always check for both ENOENT and ENOTDIR

This fixes issue 326.
Merged in bubenkoff/pytest/329-skipif-requires-expression-as-a-string (pull request #43)

re #329 add test for skipif failure when you pass boolean without the reason. add emphasize to the docs.
re #320 fallback to test scope if the class-scoped fixture is used in non-class-based test function
fix docs wrt norecursedirs, thanks @mgax
fix issue320 - fix class scope for fixtures when mixed with
module-level functions.  Thanks Anatloy Bubenkoff.
Update README.rst

change the travis link and image to be correct
change copyright years
fixes for py25 in test_skipping
Merge pull request #2 from bubenkoff/py25-test_skipping_faild

fixes for py25 in test_skipping
correct travis build status image url
Merge pull request #3 from bubenkoff/travis-status-icon

correct travis build status image url
send IRC notifications to pytest-dev
fix link to kotti
add python testing training
Merged in pfctdayelise/pytest (pull request #38)

A couple of improvements to parametrize
merge better parametrize error messages, thanks Brianna Laugher
some python2.5/3.3 fixes of Brianna's parametrize improvements