Fixed typos, etc.
Merge pull request #236 from CartoDB/typoFixes

Fixed typos, etc.
Update Map-API.md
Merge pull request #237 from CartoDB/templateid_typo

Update Map-API.md
Merge branch 'master' into static-controllers