Merge with upstream -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with upstream manifest hash: 78c3657547aa957be685a4d54462570eb4b5e181 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxFpbW7P1GVgWeRoRAqWGAKCkLQPbZpdLCBWKD+pecMtTRiu9EACfbuz4 dtHuM/86dYZ6CRqQHohJVjk= =v+Vv -----END PGP SIGNATURE-----

--- a/TODO
+++ b/TODO
@@ -8,6 +8,7 @@ General:
 - export to git
 - Add standard files: ChangeLog? What else?
 - Code cleanup: apply http://python.org/peps/pep-0008.html
+- Replace all remaining print statements with appropriate ui function
 
 Core:
 - difflib creating/removing files (fixed except dates: should be epoch)