fixed stylesheet error
fixing stuff
fixed merge conflicts
removed invalid curly brace
Merge branch 'master' into account
Merge branch 'master' into account
grays out inactive accounts
other_providers method for user created
adds link_to for other_providers on account page
can add multiple credentials
unsubscribing from feed hides element with jquery
Merge branch 'master' into account