change gitignore to ignore alchemy.yaml
d3 view for keywords on the journal entry show page
fix merge conflict
Merge pull request #36 from christophwong/integrate-d3

Integrate d3