monster commit because i am a bad bad man
holds balls and hopes this fixes git ignore
lots of progress around the diary system