Fixed diary entries to something cleaner
Merge branch 'develop' of github.com:mfolsom/somatra into develop