nginx is insane and doesn't process add_headers in diff blocks

http://stackoverflow.com/a/19135714/16075
Merge branch 'staging' of github.com:18F/18f.gsa.gov into staging