diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..c7141cc47a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,28 @@
+# Python releases to test
+language: python
+python:
+  - 2.7
+# Django releases
+env:
+  - DJANGO_VERSION=Django==1.6.1
+# Services
+services:
+  - redis-server
+  - elasticsearch
+# Package installation
+install:
+  - python setup.py install
+  - pip install psycopg2 pyelasticsearch elasticutils
+# Pre-test configuration
+before_script:
+  - psql -c 'create database wagtaildemo;' -U postgres
+# Run the tests
+script: python runtests.py
+# Who to notify about build results
+notifications:
+  email:
+    recipients:
+      - wagtail-ci@torchbox.com
+    on_success: change
+    on_failure: always
+
diff --git a/README.rst b/README.rst
index 0664ff04ea..a454db2095 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,8 @@
+|BuildStatus|_
+
+.. |BuildStatus| image:: https://travis-ci.org/torchbox/wagtail.png?branch=master
+.. _BuildStatus: https://travis-ci.org/torchbox/wagtail
+
 Wagtail CMS
 ===========
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html
index fb2ca74fe9..52eb1c89c6 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html
@@ -11,7 +11,7 @@
             <li><a href="{% url 'wagtailadmin_pages_select_type' %}" class="icon teal icon-plus-inverse">New page</a></li>
         {% endcomment %}
         <li class="footer">
-            <div class="avatar icon icon-user"><a href="{% url 'wagtailadmin_account' %}" title="Account settings">{% if request.user.email %}<img src="{% gravatar_url request.user.email %}" />{% else %}Account{% endif %}</a></div>
+            <div class="avatar icon icon-user"><a href="{% url 'wagtailadmin_account' %}" title="Account settings">{% if request.user.email %}<img src="{% gravatar_url request.user.email %}" />{% endif %}</a></div>
             <a href="{% url 'django.contrib.auth.views.logout' %}">Log out</a>
         </li>
         {% if request.user.is_superuser %} {# for now, 'More' links will be superuser-only #}