Merge branch 'master' of github.com:oscurrency/oscurrency

* 'master' of github.com:oscurrency/oscurrency:
  do not include pseudo reqs on dashboard. closes gh-598
  fix install script. closes gh-597.
  Do not include reqs and offers of deactivated people. closes gh-343.
  make sure geocode_address is only called once. closes gh-596
  use i18n for both new instances of or that precede create req and offer buttons. closes gh-482
  Seperating Add New Offer with select form a 'or'
  Mimick - styles/containers from requests - reposition offer button
  Fine tuning text/item positions - Requests
  Req button - to the right of the dropdown list
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Adds fixtures list to forum post specs
fix heroku install option to manually configure SMTP. related to gh-597
Merge branch 'master' of github.com:oscurrency/oscurrency

* 'master' of github.com:oscurrency/oscurrency:
  fix heroku install option to manually configure SMTP. related to gh-597
Merge branch 'master' into vrl-master

* master:
  fix heroku install option to manually configure SMTP. related to gh-597