diff --git a/.gitignore b/.gitignore
index 6f6fc624..9e01560a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ mediagoblin.egg-info
 *.pyo
 docs/_build/
 user_dev/
-server-log.txt
\ No newline at end of file
+server-log.txt
+*~
\ No newline at end of file
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html~ b/mediagoblin/templates/mediagoblin/auth/login.html~
deleted file mode 100644
index d5a5ddef..00000000
--- a/mediagoblin/templates/mediagoblin/auth/login.html~
+++ /dev/null
@@ -1,44 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "mediagoblin/base.html" %}
-
-{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
-
-{% block mediagoblin_content %}
-  <h2>Login:</h2>
-
-  <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
-        method="POST" enctype="multipart/form-data">
-
-    {% if login_failed %}
-      <p><i>Login failed!</i></p>
-    {% endif %}
-
-    <table>
-      {{ wtforms_util.render_table(login_form) }}
-      <tr>
-        <td></td>
-        <td><input type="submit" value="submit" class="button_green"/></td>
-      </tr>
-    </table>
-
-    {% if next %}
-      <input type="hidden" name="next" value="{{ next }}" class="button_green" />
-    {% endif %}
-  </form>
-{% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/auth/register.html~ b/mediagoblin/templates/mediagoblin/auth/register.html~
deleted file mode 100644
index de3ec71d..00000000
--- a/mediagoblin/templates/mediagoblin/auth/register.html~
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "mediagoblin/base.html" %}
-
-{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
-
-{% block mediagoblin_content %}
-  <form action="{{ request.urlgen('mediagoblin.auth.register') }}"
-        method="POST" enctype="multipart/form-data">
-    <table>
-      {{ wtforms_util.render_table(register_form) }}
-      <tr>
-        <td></td>
-        <td><input type="submit" value="submit" class="buttonGreen" /></td>
-      </tr>
-    </table>
-  </form>
-{% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/base.html~ b/mediagoblin/templates/mediagoblin/base.html~
deleted file mode 100644
index 4b634cf1..00000000
--- a/mediagoblin/templates/mediagoblin/base.html~
+++ /dev/null
@@ -1,53 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-<html>
-  <head>
-    <title>{% block title %}MediaGoblin{% endblock title %}</title>
-    <link rel="stylesheet" type="text/css"
-          href="{{ request.staticdirect('/css/base.css') }}"/>
-  </head>
-
-  <body>
-    {% block mediagoblin_body %}
-      {% block mediagoblin_header %}
-      <div class="mediagoblin_header">
-      <div class="mediagoblin_content">
-              {% block mediagoblin_logo %}
-                <a href="{{ request.urlgen('index') }}">MediaGoblin</a>
-              {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}
-              {% block mediagoblin_header_subtitle %}
-                Clever subtitle here!
-              {% endblock %}
-          {% if request.user %}
-                Welcome {{ request.user['username'] }}! --
-                <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
-                  Logout</a>
-          {% else %}
-                <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
-                  Login</a>
-          {% endif %}
-      </div>
-      </div>
-      {% endblock %}
-      <div class="mediagoblin_content">
-        {% block mediagoblin_content %}
-        {% endblock mediagoblin_content %}
-      </div>
-    {% endblock mediagoblin_body %}
-  </body>
-</html>
diff --git a/mediagoblin/templates/mediagoblin/media_details.html~ b/mediagoblin/templates/mediagoblin/media_details.html~
deleted file mode 100644
index bd63a289..00000000
--- a/mediagoblin/templates/mediagoblin/media_details.html~
+++ /dev/null
@@ -1,34 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "mediagoblin/base.html" %}
-{% block mediagoblin_content %}
-
-  {# temporarily, an "image gallery" that isn't one really ;) #}
-  {% if media %}
-    <h1>Media details for {{media.title}}</h1>
-    <div>
-      <img src="{{ request.app.public_store.file_url(
-                    media.media_files.main) }}" />
-  
-      <br/>Uploaded: {{ media.created}}
-      <br/>Description: {{media.description}}
-    </div>
-  {% else %}
-    <p>Sorry, no such media found.<p/>
-  {% endif %}
-{% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/root.html~ b/mediagoblin/templates/mediagoblin/root.html~
deleted file mode 100644
index e2b2730a..00000000
--- a/mediagoblin/templates/mediagoblin/root.html~
+++ /dev/null
@@ -1,56 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "mediagoblin/base.html" %}
-
-{% block mediagoblin_content %}
-  
-  <h1>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h1>
-
-  {% if request.user %}
-  <p>
-    <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a>.
-  </p>
-
-  {% else %}
-  <p>
-    If you have an account, you can
-    <a href="{{ request.urlgen('mediagoblin.auth.login') }}">Login</a>.
-  </p>
-  <p>
-    If you don't have an account, please 
-    <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Register</a>.
-  </p>
-
-  {% endif %}
-
-  {# temporarily, an "image gallery" that isn't one really ;) #}
-
-  <div>
-    <ul>
-      {% for entry in media_entries %}
-        <li>
-          <a href="{{ request.urlgen('mediagoblin.user_pages.media_home',
-                   user= entry.uploader.username, m_id= entry._id) }}">
-            <img src="{{ request.app.public_store.file_url(
-                      entry['media_files']['thumb']) }}" /></a>
-        </li>
-      {% endfor %}
-    </ul>
-  </div>
-
-{% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html~ b/mediagoblin/templates/mediagoblin/submit/start.html~
deleted file mode 100644
index 21a7ed4e..00000000
--- a/mediagoblin/templates/mediagoblin/submit/start.html~
+++ /dev/null
@@ -1,35 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "mediagoblin/base.html" %}
-
-{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
-
-{% block mediagoblin_content %}
-  <h2>Submit yer media</h2>
-
-  <form action="{{ request.urlgen('mediagoblin.submit.start') }}"
-        method="POST" enctype="multipart/form-data">
-    <table>
-      {{ wtforms_util.render_table(submit_form) }}
-      <tr>
-        <td></td>
-        <td><input type="submit" value="submit" class="button_green" /></td>
-      </tr>
-    </table>
-  </form>
-{% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/test_submit.html~ b/mediagoblin/templates/mediagoblin/test_submit.html~
deleted file mode 100644
index ebf93b59..00000000
--- a/mediagoblin/templates/mediagoblin/test_submit.html~
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
-
-<html>
-  <body>
-    <form action="{{ request.urlgen('test_submit') }}" method="POST"
-          enctype="multipart/form-data">
-      <table>
-        {{ wtforms_util.render_table(image_form) }}
-        <tr>
-          <td></td>
-          <td><input type="submit" value="submit" class="buttonGreen" /></td>
-        </tr>
-      </table>
-    </form>
-  </body>
-</html>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html~ b/mediagoblin/templates/mediagoblin/user_pages/media.html~
deleted file mode 100644
index 08cc9251..00000000
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html~
+++ /dev/null
@@ -1,41 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "mediagoblin/base.html" %}
-{% block mediagoblin_content %}
-
-  {# temporarily, an "image gallery" that isn't one really ;) #}
-  {% if media %}
-  <h2>Media details for <a 
-             href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-             user= media.uploader.username) }}">{{media.uploader.username}}</a>
-             / {{media.title}}
-  </h2>
-  <div>
-    <img src="{{ request.app.public_store.file_url(
-                  media.media_files.main) }}" />
-
-          <br/>Uploaded on {{ "%4d-%02d-%02d"|format(media.created.year,
-             media.created.month,media.created.day)}} by <a 
-             href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                   user= media.uploader.username) }}">{{media.uploader.username}}</a>
-          <br/>Description: {{media.description}}
-  </div>
-  {% else %}
-  <p>Sorry, no such media found.<p/>
-  {% endif %}
-{% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html~ b/mediagoblin/templates/mediagoblin/user_pages/user.html~
deleted file mode 100644
index 4ae7986e..00000000
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html~
+++ /dev/null
@@ -1,39 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "mediagoblin/base.html" %}
-{% block mediagoblin_content -%}
-  {% if user %}
-    <h1>User page for '{{ user.username }}'</h1s>
-
-    {#- Should we outsource such a media 'gallery' view to it's own file?
-        It could be useful for the home page and other views too -#}
-    <ul>
-      {%- for entry in media_entries %}
-      <li>
-        <a href="{{ request.urlgen('mediagoblin.user_pages.media_home',
-                 user= entry.uploader.username, m_id= entry._id) }}">
-          <img src="{{ request.app.public_store.file_url(
-                    entry['media_files']['thumb']) }}" /></a>
-      </li>
-      {%- endfor %}
-    </ul>
-  {% else %}
-    {# This *should* not occur as the view makes sure we pass in a user. #}
-    <p>Sorry, no such user found.<p/>
-  {% endif %}
-{% endblock %}