Code Updates

Adjusted code so it is in sync with local software's changes -- repo code was one commit behind internal changes; this PR brings it up to date.

#### Changes/Local Synchronization:
* Indentation fixed throughout
* onDataSuccess and onDataFailure objects added
* Changed thrown error in getJSON to use onDataFailure
* Changed success in getJSON to use onDataSuccess