Added tests for Conference
Typo
Merge branch 'v2.1' of github.com:agiliq/plivo-python into v2.1