* add svn revision to rpm release number
* remove test-related static resources
* include locale svn revision in ver.txt

Conflicts:

	scripts/browserid.spec

break common production config out into production.json, dev.json is dead now that dev is just an aws deployment

in production_locales, only use local.json if nothing else is explicitly configured in the environment

close #1042

Fixing up a bunch of cancel primary verification flows. This is when a user is verifying with a primary and they hit ccancel and are redirected back to BrowserID.

Flows:

* Required email cancel.
* Cancel add user to current account.
* Cancel create new user.

Others Items added.

* Add a "cancel" button to the sample RP.
* Defer how state should be handled for primary user verification from dialog to state.

issue #983
issue #1036

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

close #1031

Conflicts:
	resources/static/dialog/views/required_email.ejs
	resources/static/dialog/views/verify_primary_user.ejs
	scripts/deploy/vm.js