Merge pull request #3 from ocbrewing/master

styling and create_insts_func changes
changed some naming stuff
Updated Server model, gets upTime info from SimpleTenantUsage to send to account/billing table.
Merge remote-tracking branch 'upstream/master'