Merge branch 'master' into deploy-env

Conflicts:
	cloudfoundry.md

.travis.yml

@@ -2,8 +2,8 @@ language: python
 python:
   - "3.4"
 install:
-  - pip install -r requirements.txt --use-mirrors
-  - pip install -r requirements-dev.txt --use-mirrors
+  - pip install -r requirements.txt
+  - pip install -r requirements-dev.txt
 script:
   - coverage run --source=foia_hub manage.py test --settings=foia_hub.settings.test
 

cloudfoundry.md

@@ -108,4 +108,13 @@ heroku run python manage.py migrate
 Status:
 
 * `fab deploy` will stay hanging, but successfully daemonize the app.
-* The webhook is down.
+* The webhook is down.
+
+## Load the data
+
+Right now, load it *locally* from your laptop, with a connection string pointed at the production DB:
+
+```bash
+./manage.py load_agency_contacts /path/to/foia/contacts/data
+
+Better instructions TBD!

foia_hub/templates/contacts/profile.html

@@ -15,15 +15,13 @@
 
 <div class="container">
     <section class="breadcrumbs">
-      <a href="/">
-        Home &gt;
-      </a>
+      <a href="{{ url('home') }}">Home &gt;</a>
       {% if profile.parent %}
-        <a href="/contacts/{{ profile.parent.slug }}">
+        <a href="{{ url('contact_landing', profile.parent.slug) }}">
           {{ profile.parent.name }} &gt;
         </a>
       {% elif profile.is_a == "office" %}
-        <a href="/contacts/{{ profile.agency_slug }}">
+        <a href="{{ url('contact_landing', profile.agency_slug) }}">
           {{ profile.agency_name }} &gt;
         </a>
       {% endif %}
@@ -56,15 +54,15 @@ <h2>Submit a request</h2>
             <div class="subdetails">
                <h3> Request online </h3>
                 <ul>
-                  <li><a
                     {% if profile.request_form_url %}
-                      href="{{ profile.request_form_url }}"
+                        <li>
+                            <a href="{{profile.request_form_url}}">{{profile.request_form_url}}</a>
+                        </li>
                     {% elif profile.emails|length>0 %}
-                      href="/request/{{ slug }}"
+                        <li>
+                            <a href="{{url('form', slug)}}">Use our web form</a>
+                        </li>
                     {% endif %}
-                    >
-                      Submit a request via web
-                  </a></li>
                 </ul>
             </div>
           <hr>

foia_hub/templates/index.html

@@ -24,7 +24,7 @@ <h1><em>How does the process work?</em></h1>
 				<ol class="default">
 
                     <li>You (the requester) submit a FOIA request to the agency
-                    you think has the information you see.</li>
+                    you think has the information you seek.</li>
 
                     <li>In most cases, FOIA officials at that agency will
                     confirm (via email) receipt of your request and begin