Rails4

trying to get rails4 branch to latest working state