joi doesn't like undefined entries
Merge pull request #418 from dannycoates/prod-oops

joi doesn't like undefined entries
Use valid passwordStretching.salt in loadtest script.
Fix commit-ordering bug in mysql backend
Merge pull request #420 from mozilla/rfk/fix-commit-ordering

Fix commit-ordering bug in mysql backend
updated vagrant for load testing
made log level configurable in dev
Merge pull request #423 from dannycoates/lg

made log level configurable in dev
minimum change to fix #422 memory leak. new issue #426 for the rest
Merge pull request #428 from mozilla/dc/nonce

Fixed nonceCheck type conversion bug
updated hapi
removed callbacks from client lib
Merge pull request #430 from dannycoates/decallback

removed callbacks from client lib
expose timestamp header to clients that use CORS
Merge pull request #431 from zaach/expose-timestamp

expose timestamp header to clients that use CORS
update browser request
Merge remote-tracking branch 'idp/master' into merge-dec-14

Conflicts:
	Vagrantfile
	bin/key_server.js
	config/dev.json
	db/mysql.js
	loadtest/loadtests.py
	package.json
	routes/account.js
	routes/rawpassword.js
	server/server.js
fix for browser request
Merge branch 'master' into umd-d

Conflicts:
	web/bundle.js
update bundle