Merge pull request #22 from purple-martins-2013/starred_stories

specify starred_stories association on user in addition to user.stories
Merge branch 'master' into profile_page