Merge pull request #4 from OpenSourceFieldlinguistics/master

Changes from upstream so you can work on the CAML paper...
Merge pull request #1329 from hisakonog/master

Merge pull request #4 from OpenSourceFieldlinguistics/master