Updating API.md. Solving manually conflicts in PullRequest 164, pulled from develop
Fix typos.
Fix typo2
Merge pull request #220 from CartoDB/Updating_APImd-Solving_conflicts_in_PR164

Updating api.md solving conflicts in pr164
thanks @xavijam !