Merge pull request #789 from ajdavis/opts-enhancements

Make options instance more dict-like.

diff --cc tornado/options.py
Simple merge

diff --cc tornado/test/options_test.py
Simple merge