updates to rails4 / cleanup.