WIP - rails4 updates