Small Python 3 fix for issue #369's test.
Remove some unused imports.
Minor cosmetic changes.
Remove some duplicated classes in bpython.autocompletion.
Fix duplicated test case name.
Python 3 fixes for urwid. Closes #243.
Merge remote-tracking branch 'upstream/master'