redo changes to api.rb that were missed somehow in the merge
Changing file to reflect the contents of the file on master
Merge cedar into master