Setup

Merging in setup branch for rails. V 3.2.14.