Conflicts:

	lib/primary.js

Depending on Squid for caching primary's /.well-known/browserid

don't log more information than is needed in browserid-metrics.json - strip everything from referrer except origin - issue #1283

remove dead code: added for compress script cleanup, but not needed.  static_resources.minified() === Object.keys(static_resources.all())

rewrite compress scripts in javascript: better output, build of resources only when needed, uses multiple    cores, and leverages the same resource lists as cachify so we only express what dev resources go into what prod resources once #DRY.  closes #1009 closes #660

improve documentation of mysql wrapper and associated tests, remove debug console output, fail slow queries rather than retrying, and add a statsd counter for failed_query

  * all database functions return an err as the first param which is non-null for failure.
  * all wsapis handle database errors and return service unavailable to client.
  * stalled-mysql-test implements unit tests to verify proper failure behavior of all wsapis.
  * configuration parameter added to define max allowed time per query

@shane-tomlinson's feedback: fix test.ejs route to not include , which causes static middleware to redirect to  - now you can run tests by hitting /test, /test/, or /test/index.html

explicitly disable serving of unit test templates and all resources under /test in staging or prod envs.  issue #1044

refactor httputils to remove needless logic and better leverage express.  easier to read and maintain.  also remove unused and unnec functions

* Add a new view, cookies_disabled - this is displayed to browsers that do not allow access to localStorage when cookies are disabled (Firefox, Chrome, Fennec)
* Add localStorage check in include.js to check for browsers that do not allow write access to localStorage.
* Add a Javascript cookie check in network.js->cookiesEnabled using a test cookie with duration of 1 second so it is never sent to the server.
* Remove the old cookies_enabled check that was theorized to come from session_context - remove this from the XHR mock as well.

issue #835

vary session cookie name by public_url when public_url is not browserid.org - this addresses issues which affect testing with IE when cookies are set for both, diresworb.org and dev.diresworb.org.  closes #296.

don't require the user to sign in with a password as a side effect of using a primary email address.  closes #1049

update wsapi to return a body of 'Bad Request: no cookie' when a CSRF check fails because no cookie was sent from the client - issue #835, issue #1056

fix char munging when postprocess is in play serving large files where unicode chars fall on chunk boundaries.  closes #1057

The change to the new config busted the way include.js was served.  Instead of checking which env is being used, check whether the user wants to use minified resources.  If they do, serve up the compressed include.js, if not, serve up the debug version.

close #1027
close #1035

This reverts commit 8ce33a52.