Merge branch 'release/1.0.0' into develop
[DOC] Comment typo.
[FEATURE] Add terminate feature
[CS] Make travis config match other Adhearsion projects
Merge pull request #2 from chewi/feature/terminate

[FEATURE] Add terminate feature
[CS] Fix bundler gem source
[CS] Guard rspec v1 is deprecated
[CS] Whitespace
[CS] Allow setting an alternative condition

Will allow use of Celluloid::Condition in place of ConditionVariable
[DOC] Changelog entry
[UPDATE] Bump to 1.1.0
Merge branch 'release/1.1.0'