#172 public bids
#155 turn on/off Open ID feature
#172 public bids
#508 inbox
Merge branch 'inbox' of github.com:keating/oscurrency into keating-inbox
#492 Pay Now error when price is zero
change search field with from span2 to span1. closes gh-508
Merge branch 'zero-price' of github.com:keating/oscurrency into keating-zero-price
use bootstrap_form_for for exchange_offer_form partial so validation error message appears adjacent to field. closes gh-492
mark linebreak as html_safe. related to gh-510
fix remote scripting. closes gh-512
if production env and memcachier enabled, set openid store to OpenID::Store::Memcache. unicorns have their own memory stores. related to gh-155
TKT385 disable link expired offers
upgrade to rails 3.2.16. closes gh-513
fix merge conflict. closes gh-385
Merge branch 'public-bid' of github.com:keating/oscurrency into keating-public-bid
use cancan for bids. flash messages for cancan exceptions. closes gh-172
should not include unread trashed messages in inbox count. closes gh-515
add openid boolean to preferences. closes gh-155
remove formatting note from new message form. closes gh-182