ttlogmerge: ignore afk/off/RETRO when working out which of two log lines has more content
ttlogmerge: add TODO
ttlogmerge: convert to make output filename optional (default: STDOUT)
beeminder.pl: move cache files to main directory
ttlogmerge.pl: improvements
ttlogmerge: better handle error lines in the log
beeminder.pl: Regenerate cache if cache file empty (facilitates syncing with Unison across multiple machines)
Clean up sound stuff
Merge branch 'ttlogmerge' of github.com:pmyteh/TagTime into pmyteh-ttlogmerge

Conflicts:
	beeminder.pl
- Reorganized databases acceses through a singleton to eliminate locking
race conditions
- Comments prior to final testing and release
- Added "visit goal" button to Beeminder links
Merge branch 'master' of github.com:/dreeves/TagTime
android: Added an about dialog to preferences
android: updated changelog
Fixed ping list update
Scrap backwards-compatibility check
Merge branch 'master' of github.com:dreeves/TagTime