Merge in latest development tree

Password reset/change, remove various occurances of 'or' between button and adjust the content div width

ivatar/ivataraccount/templates/add_email.html

@@ -17,7 +17,7 @@
 {% if form.email.errors %}
 <div class="alert alert-danger" role="alert">{{ form.email.errors }}</div>
 {% endif %}
-<div style="max-width:600px">
+<div style="max-width:640px">
 <form action="{% url 'add_email' %}" name="addemail" method="post" id="form-addemail">
 {% csrf_token %}