added prereqs section to README.md; fixes #192
Merge pull request #201 from ckarlof/readme-prereqs

Added prereqs section to README.md; fixes #192
removed special handling of stats and server.log file

Stats should now just be log messages with `op:"stat"`.
Logs are only written to stderr. Handle any extra log IO
outside of the server process.
removed extra log config options
Tweak loadtests to run using the AWS cluster, rather than local machine.
Changes the verification tests to use freshly created emails for each test and fixes some concurrency bugs in how the tests check for the verification and reset codes. Fixes #188
Re-enable the test to make sure we can still log in after a reset password
Merge pull request #208 from ckarlof/issue-188

Changes the verification tests to use freshly created emails for each test and fixes some concurrency bugs in how the tests check for the verification and reset codes. Fixes #188
Simplify and cleanup heka+awsbox setup.
Merge pull request #206 from mozilla/loadtest-tweaks

Tweak loadtests to run using the AWS cluster, rather than local machine.
Merge pull request #207 from mozilla/dev-logging-cleanup

Simplify and cleanup heka+awsbox setup.
Merge branch 'master' into cassy

Conflicts:
	scripts/start-local.sh
Merge pull request #183 from dannycoates/cassy

Add date/timestamps to key_server.js.log
add verify reset code to client api
Merge pull request #203 from zaach/verify_reset_code_api

add verify reset code to client api
Merge branch 'master' of github.com:mozilla/picl-idp into merge-26-9-2013

Conflicts:
	.awsbox.json
	README.md
	bin/key_server.js
	config/config.js
	log.js
	package.json
	scripts/awsbox/post_create.sh
	scripts/awsbox/post_deploy.sh
	scripts/start-local.sh
update bundles
Fixes typos
Merge pull request #17 from vladikoff/module-typos-1

Fixes typos
Fixes grunt-browserify dev dep