Merge pull request #25 from txstate/master

Support for getting conflicting events
Fixed issue #26.  Should probably write further tests for this.