Fix name collision issue
Merge pull request #813 from twitter/rename-option

Fix name collision issue
Bump algebird to 0.5.0 and chill to 0.3.6
Merge pull request #814 from twitter/jco/alg_050_chill_036

Bump algebird to 0.5.0 and chill to 0.3.6