Fixed test case for logging.
Merge branch 'titan05' of https://github.com/thinkaurelius/titan into titan05
Add *.DS_Store to .gitignore
(cherry picked from commit 60d15686a23fa9e0bb768998d19a7d80ccf46c34)
Merge branch 'titan05' into hadoop-reindex