Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
change usage text (to match changes in commit e6d124ad7c)
Merge pull request #26 from joates/master

small text change.. s/lib/api/