Reverted this branch back to rails 3.2.13