Add env var for RABBIT_HOST (bug 1083690)
Trim down site_config when serializer=commonplace (bug 1093590)
Include waffle switches and FxA stuff in commonplace index.html (bug 1093584)
Merge pull request #2704 from diox/remove-flags-from-site-config

Trim down site_config when serializer=commonplace (bug 1093590)
load prices from dev by default, since that uses zippy
Merge pull request #2707 from andymckay/dev-default

load prices from dev by default, since that uses zippy
fix string quotes, oops
remove docker fireplace development lines from commonplace template (bug 1073617)
generate proper Contribution for zippy (bug 1091021)
Added some logging and statsd timing (bug 1088329)
s/warn/warning/ for log
Only send FxA mail to users from after guillotine split (bug 1093845)
try not to return list in extra commreplyparser
FxA prod auth URL is api.accounts.firefox.com
don't pretend this is a dev-only setting
Merge pull request #2708 from ngokevin/rmfireplacelines

remove docker fireplace development lines from commonplace template (bug 1073617)
Small optimizations to FeedView (bug 1088329)
remove en-US from FxA URL
Commit from Mozilla Verbatim by user kohei.yoshino@gmail.com.: 1992 of 1992 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni