And now the actual commit...and untrack Scanner.pyc since it was causing
merge errors.