Merge pull request #1 from jrwdunham/master

Release 0.0.1
setting OpenSourceFieldlinguistics as the upstream where deploys come from
Merge pull request #2 from cesine/travis

Travis
Merge pull request #1 from OpenSourceFieldlinguistics/master

This should make my fork errored