better parsing, closes #3, closes #4
Merge pull request #5 from ucsf-ckm/munge

better parsing, closes #3, closes #4