GAACK typos
Merge branch 'master' into travis
Merge pull request #13 from OpenTreeOfLife/travis

Travis