Fixed up parameters being passed in via json string
removed extraneous files and fixed up callback check in client.js
resolving merge of client.js