Be more tolerant of malformed history directories
Merge branch 'master' of github.com:skishore/dropblox