Add plaid support
Fix merge conflict
Merge branch 'master' into develop
adds categories from plaid and associates them