Removed some annoying logic tree tests (they will be rewritten, see https://bugs.launchpad.net/oq-engine/+bug/1323916
Merge branch 'master' of github.com:gem/oq-engine into fast-export
Merge branch 'fast-export' of github.com:gem/oq-engine into fast-export
Fixed a couple of tests
Fixed a very subtle ordering bug in the event based calculator