Updates for rails4 and a few workflow improvements