Merge dictionary changes from the master branch

Add a --force option that doesn't do raw_input

fix more encoding problems

one more smart_unicode

Make sure logging works if stdout is a tty

Instantiate the logger before use :-)

Add a --force option that doesn't do raw_input

Fix a typo

Add a --force option that doesn't do raw_input