Merge remote-tracking branch 'ybart/rails4-column_for_attribute' into rails4