1) addressed issue https://dev.guardianproject.info/issues/542 which works on my nexus one.  might not be the final fix.
2) some initial work towards switching from whole-upload to torrent-upload in case of low-bandwidth scenario
3) string cleanup
typo