added ajax supporter delete
Merge branch 'master' into user-supporter-forms
added labels methods -- not working right now
got labels to work
Merge branch 'master' of https://github.com/danisaurus/shift-api into feature-gmail-api-retrieving-labels
merging with master
added confirm message for supporter delete and finished the rest of the crud stuff for users
Merge branch 'master' into user-supporter-forms
added magic module and historygetter class
Merge branch 'master' of https://github.com/danisaurus/shift-api into gmail-history
Merge pull request #8 from danisaurus/gmail-history

Gmail history
Merge pull request #7 from danisaurus/user-supporter-forms

User supporter forms
added user logic, added migration table to include access_token for user, moved history_getter logice to vendor directory
Merge branch 'master' of https://github.com/danisaurus/shift-api into features-active-user-logic
beginning user flow
Users can sign up, log in, the user dashboard has a link to oauth, setup contacts, and setup triggers
Merge pull request #9 from danisaurus/user-flow-matt

User flow matt
added active methods to user model and history_getter
making those fuckin triggers work
fixed merge conflicts