Merge branch 'master' of github.com:stewsmith/social_courses
Merge branch 'master' of github.com:/stewsmith/social_courses
Friends now migrate