Merge pull request pytest-dev#20 from 05bit/transactions

Merge transactions branch, still untested in depth, basic tests are passing

Author: rudyryk