Merge Req: Rails Ajax shit we just worked on

wooyay