User config

@alex-nexus Can you take a look at what I did.  I updated the schema so that users table have everything that user_subscriptions has.  Let me know if this is ok to be merge, and let me know what I should do next.  There are still a lot of files that contain "user_subscription".  I don't know if there is an easier way to keep that name.  
How about just drop the user subscription table from previous migrations?