updating shanti to rails 2.3.14
point to latest fathom engine
point to latest fathom engine
getting branches together for consistency.