Diary site generated with permalinks as per D6, fixed tags: []
fixed corrupted sónar tags, missed merge conflicts, unix line endings
Images imported via much SQL, Python hackery