bundle and migration to get up to date with devise branch