Merging Change from Ben Woosley

Merging changes from Ben, includes upgrade to rails 2.3.8.