Updating api.md solving conflicts in pr164

Pulled from develop, resolving conflicts https://github.com/CartoDB/cartodb.js/pull/164
cc @ohasselblad @xavijam @javisantana