Add a variant favorite template tag for @amycesal
switch to favorites_short tag for @amycesal
Merge branch 'design-2012-11-13' of github.com:sunlightlabs/openstates into design-2012-11-13

Conflicts:
	site/templates/billy/web/public/user_favorites.html