Cleaned up some more
Merge branch 'master' of https://github.com/JustinBohr/new_logbook.git