Favorites

cleaned up favorites feature the other group worked on... fixed some typos that were breaking devise and stripped out some debugging code from the view. resolved conflicts between the branch and master.