Make things more compatiable with newer python

Fix the expeditions list
Improvements to make it compatiable with django 1.8
Bump the years to add 2018
Update the .hgignore file to ignore junk

1 files changed, 1 insertions, 1 deletions

diff --git a/templates/flatpage.html b/templates/flatpage.html
index 73be1b2..ebe5b1b 100644
--- a/templates/flatpage.html
+++ b/templates/flatpage.html
@@ -7,7 +7,7 @@
   {% if editable %}
     <a href="{% url "editflatpage" path %}">Edit</a>
   {% endif %}
-  {%else %}
+  {% else %}
     {% if not has_menu %}
       {% include "menu.html" %}
     {% endif %}