goodbye spork and simplecov, tired of you
Merge pull request #99 from twitter/fix_187

goodbye spork and simplecov, tired of you
Add standard CSP level 2 nonce
no need to ||=
only set the nonce if actually used.
add backwards-compatibility layer for nonces
Merge pull request #98 from twitter/nonce

Add standard CSP level 2 nonce
Merge branch 'master' into enforce_lambda

Conflicts:
	fixtures/rails_3_2_12/spec/controllers/other_things_controller_spec.rb
	lib/secure_headers/headers/content_security_policy.rb