resolved escaping issues with gridzilla gem
changing Gemfile to refer to gridzilla gem on github with branch of rails32
pulling from upstream, merge conflicts