Updates in support of rails dev (zomg)