added mockjax to intercept ajax calls
code clean up
merge with current feature/testing to include mockjax