Added error_controller to return 404 errors in json.  Added C Wonder and Saks. Updated parsing tasks
Merge branch 'staging'