Pulling some simple (mostly renaming) changes up
a little more user_card => auth_card
Merge branch 'develop' into simple_stuff
right/tag cleanup, plus mailer cleanup
A bit of card_controller cleanup
fixing up update_references
fixed update_references merge conflict
further polishing update_references
Merge branch 'develop' into simple_stuff
even further polishing update_references
Merge remote branch 'origin/simple_stuff' into simple_stuff
added failing inclusion comment spec
Merge branch 'master' into cardrefs
authorized to current, and move to_html to initializers (String extension)
Some new tests, a comment test on the controller: ATP
Merge repo changes we didn't have yet (a merge or two?)
fixed update_references merge
Controller.current_account_id
fixed update_references brokenness
Merge remote-tracking branch 'gerry/simple_stuff' into develop