Add optional opaque "service" parameter to verification emails.
Merge pull request #342 from mozilla/rfk/rpid-in-email-links

Add optional opaque "rpid" parameter to verification emails.
use ass for code coverage - issue #94
Merge pull request #446 from lloyd/master

use ass for code coverage - issue #94
Stop sending bound emails to rfkelly; there's only noise in there.
awsbox needs a verified sender address
fixed client in 'prod-y' environments
Add ability to log security-related events.
Filter empty strings from the remoteAddressChain
Ensure 'uid' is present on all relevant security events.
sketch of asserting logs in tests
Move log-testing dependencies into devDependencies
Add tests for security-event logging output.
Add comment re: filtering of XFF header.
Merge pull request #453 from mozilla/rfk/security-events

Add ability to log security-related events.
add the OmniGraffle source for the "onepw" protocol diagrams

Recently exported PNG images from this are included in this repo's
related wiki, on this page:

 https://github.com/mozilla/fxa-auth-server/wiki/onepw-protocol
update onepw.graffle: HKDF details, new token names
Update awsbox config to use port 587 for SES SMTP access.
added vmware fusion to vagrantfile
Merge remote-tracking branch 'mozilla/master' into onepw

I made a couple changes to the log.security tests that
I'm not 100% sure about. I've created and issue to verify
the new assertions.

Conflicts:
	client/api.js
	package.json
	routes/account.js
	routes/password.js
	test/run/pbkdf2_tests.js