Clean whitespace and some extra cruft from the merged 'favorites' branch
Merge branch 'clean_favorites'

* clean_favorites:
  Clean whitespace and some extra cruft from the merged 'favorites' branch