Meetings update to match latest conflict detection

yaml2ical 0.2.0 now correctly detects conflicts, so we don't need to
bypass some meetings.

It actually caught a real conflict (nova-bug-scrub conflicted on some
weeks with nova-cells-v2). Since bug-scrub isn't run since early 2014,
remove that one).

Change-Id: Iafd781537ebf4b4bec9019f8e0c58f8d0db59c67

meetings/nova-bug-scrub-meeting.yaml

@@ -1,14 +0,0 @@
-project:  Nova Bug Scrub Meeting
-schedule:
-  - time:       '1630'
-    day:        Wednesday
-    irc:        openstack-meeting-3
-    frequency:  weekly
-chair:  Tracy Jones
-description:  >
-  This is a weekly meeting review Nova Bugs. The initial focus will be on
-  triaging bugs in the New state and ensuring that critical bugs are making
-  progress. Once the new queue is under control we will switch our focus to
-  reviewing incomplete bugs, removing assignees from stale bugs so others
-  can pick them up (especially low hanging fruit). In general we will follow
-  the policies documented here https://wiki.openstack.org/wiki/BugTriage

meetings/telco-wg-meeting.yaml

@@ -2,7 +2,7 @@ project:  Telco Working Group meeting
 schedule:
   - time:       '1400'
     day:        Wednesday
-    irc:        openstack-meeting-alt-should-not-conflict
+    irc:        openstack-meeting-alt
     frequency:  biweekly-odd
   - time:       '2200'
     day:        Wednesday

meetings/ux-team-meeting.yaml

@@ -2,7 +2,7 @@ project:  User experience (UX) Team meeting
 schedule:
   - time:       '1700'
     day:        Monday
-    irc:        openstack-meeting-3-should-not-conflict
+    irc:        openstack-meeting-3
     frequency:  biweekly-even
 chair:  jcoufal
 description:  >

test-requirements.txt

@@ -1 +1 @@
-yaml2ical
+yaml2ical>=0.2.0