Now uses API. Some minor style/typo fixes.
Merge branch 'Fix_UseAPI' into EBS_Deploy
Removed unused prod stuff from gruntfile.
Merge branch 'Fix_CleanupGruntfile' into EBS_Deploy