Cleaned up backbone code, fixed json server tests, still need to get tests working