Merge pull request #1 from facebook/master

merge master from facebook tornado
fixed bug when raise error in options
comparison to None should be 'if cond is not None'
Add test for option redefinition error.