Added method for retrieving conflicting event ids
Removed unused json import
Added method for retrieving conflicting events
Fixed bug causing exception in conflicting_events() when no conflicting events existed
Added doc for conflicting events
Added tests around conflicting events
Merge branch 'development' into master