cmc333333

vagrant@packer-debian-7:~/peacecorps-site/peacecorps/peacecorps/static/peacecorps$ npm install --dev
npm WARN engine mocha@0.3.3: wanted: {"node":">= 0.4.x < 0.7.0"} (current: {"node":"0.10.35","npm":"1.4.28"})
npm WARN deprecated github-flavored-markdown@1.0.1: This project is long out of date. Use 'marked' instead.
npm WARN deprecated tap-runner@0.0.7: this is merged into the 'tap' module now
npm WARN deprecated tap-producer@0.0.1: this is merged into the 'tap' module now
npm WARN deprecated tap-consumer@0.0.1: this is merged into the 'tap' module now
npm WARN deprecated tap-results@0.0.2: this is merged into the 'tap' module now
npm WARN deprecated tap-assert@0.0.10: this is merged into the 'tap' module now
npm WARN engine koa@0.14.0: wanted: {"node":">= 0.11.13"} (current: {"node":"0.10.35","npm":"1.4.28"})
npm WARN deprecated es5-shim@2.0.5: Please update to the latest version; it overrides noncompliant native methods even in modern implementations

cmc333333

diff --git a/peacecorps/peacecorps/fixtures/countries.yaml b/peacecorps/peacecorps/fixtures/countries.yaml
index 23ee6d9..a8c3b0b 100644
--- a/peacecorps/peacecorps/fixtures/countries.yaml
+++ b/peacecorps/peacecorps/fixtures/countries.yaml
@@ -268,7 +268,7 @@
 - fields: {code: KWT, name: Kuwait}
   model: peacecorps.country
   pk: 90
-- fields: {code: KGZ, name: Kyrgyzstan}
+- fields: {code: KGZ, name: Kyrgyz Republic}

cmc333333

diff --git a/.gitignore b/.gitignore
index 0856a67..1c0630d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ peacecorps/*/static/*/sass/neat
 local_settings.py
 peacecorps/media
 peacecorps/peacecorps/tests/gpg/random_seed
+peacecorps/peacecorps/scripts/svg

cmc333333

diff --git a/contacts/data/DHS.yaml b/contacts/data/DHS.yaml
index 7977981..2804dd3 100644
--- a/contacts/data/DHS.yaml
+++ b/contacts/data/DHS.yaml
@@ -24,8 +24,7 @@ departments:
   - National Records Center, FOIA/PA Office
   - P.O. Box 648010
   - Lee's Summit, MO 64064-8010
-  description: U.S. Citizenship and Immigration Services oversees immigration to the
-    United States.

cmc333333

-----BEGIN CERTIFICATE-----
MIIGhTCCBW2gAwIBAgIRAK0nvarSxMXCpbrYq40S1y4wDQYJKoZIhvcNAQELBQAw
gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
Q0EwHhcNMTQxMDIzMDAwMDAwWhcNMTUxMDIzMjM1OTU5WjBkMSEwHwYDVQQLExhE
b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMSkw
JwYDVQQDEyBwYXkuZG9uYXRlLnBlYWNlY29ycHMtZGV2LjE4Zi51czCCAiIwDQYJ
KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJ6J96j1lLP+15446ttP48Tfp4fBK4M5
J/h4iTHiij4PscCPEWU/mhjiWkw8m4TGSquFIQXJ8uipdYuysrC09SApmRfLPZxB

cmc333333

diff --git a/contacts/data/ABMC.yaml b/contacts/data/ABMC.yaml
index 2e09d57..606fd23 100644
--- a/contacts/data/ABMC.yaml
+++ b/contacts/data/ABMC.yaml
@@ -18,4 +18,7 @@ description: "The American Battle Monuments Commission, established by the Congr
   \ in 1923, is an agency of the Executive Branch of the Federal Government. \n\n\
   The Commission-guardian of America´s overseas commemorative cemeteries and memorials-honors\
   \ the service, achievements and sacrifice of United States Armed Forces."
+keywords:
+- Freedom of information

cmc333333

INFO:root:Rewrote data/ACUS.yaml with 3 new keywords
INFO:root:Rewrote data/PC.yaml with 38 new keywords
INFO:root:Rewrote data/DNFSB.yaml with 4 new keywords
INFO:root:Rewrote data/CEQ.yaml with 6 new keywords
INFO:root:Rewrote data/FHFA.yaml with 45 new keywords
INFO:root:Rewrote data/FCSIC.yaml with 3 new keywords
INFO:root:Rewrote data/FTC.yaml with 65 new keywords
INFO:root:Rewrote data/SIGAR.yaml with 5 new keywords
INFO:root:Rewrote data/IAF.yaml with 11 new keywords
INFO:root:Rewrote data/OSHRC.yaml with 12 new keywords

cmc333333

'use strict';

//  Namespace
var Init = {
  //  State/Zip are only marked "required" if country == USA
  countryRequirements: function() {
    var country = $('#id_country'),
        countryReqLabels = $('label[for=id_state], label[for=id_zip_code]');

    country.change(function() {

cmc333333

diff --git a/foia_hub/tests/test_views.py b/foia_hub/tests/test_views.py
index d16be2d..85e0a4b 100644
--- a/foia_hub/tests/test_views.py
+++ b/foia_hub/tests/test_views.py
@@ -2,6 +2,7 @@ from datetime import date

 from django.core.urlresolvers import reverse
 from django.test import SimpleTestCase
+from mock import patch

cmc333333

diff --git a/foia_hub/views.py b/foia_hub/views.py
index 3debba1..e0249b5 100644
--- a/foia_hub/views.py
+++ b/foia_hub/views.py
@@ -9,20 +9,23 @@ from jinja2 import Environment, PackageLoader
 from foia_hub.models import Agency, FOIARequest


-env = Environment(loader=PackageLoader('foia_hub', 'templates'))
-env.globals['ANALYTICS_ID'] = settings.ANALYTICS_ID