Fixed subscribing and unsubscribing from feeds so that the association methods in the User model are correctly triggered (e.g. marking all entries as unread for the user when he subscribes to a feed).

Fixed model unit tests to account for the change in associations and the new FeedSubscription model.