okay. so i took out devise, then had trouble pushing to origin master because of non fast forward.  so i pushed the last commit with -f to origin master.  i THINK im back on track now/should be good.