diff --git a/atxpy_home/views.py b/atxpy_home/views.py
index d70e47e..2a00bb5 100644
--- a/atxpy_home/views.py
+++ b/atxpy_home/views.py
@@ -12,11 +12,17 @@ def posts():
 
 PostsMixin = context_mixin_factory(callback=posts)
 CompiledStaticMixin = context_mixin_factory({
-        "USE_COMPILED_STATIC": settings.USE_COMPILED_STATIC,
+    "USE_COMPILED_STATIC": settings.USE_COMPILED_STATIC,
+})
+SettingsContextMixin = context_mixin_factory({
+    'SITE_NAME': settings.SITE_NAME,
 })
 
 
-class IndexView(PostsMixin, CompiledStaticMixin, DetailView):
+class IndexView(PostsMixin,
+                CompiledStaticMixin,
+                SettingsContextMixin,
+                DetailView):
     model = Hero
     queryset = Hero.objects.all()
     template_name = "index.html"
diff --git a/manage.py b/manage.py
old mode 100644
new mode 100755
diff --git a/requirements.txt b/requirements.txt
index d77f3cd..4b5fd63 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
-Django==1.4
+Django==1.4.15
 Markdown==2.1.1
 Pinax==0.9a2
 South==0.7.3
 django-appconf==0.5
 django-staticfiles==1.1.2
 feedparser==5.1.1
-httplib2==0.7.1
+httplib2==0.9
 icalendar==3.0.1b2
 oauth2==1.5.170
 -e git://github.com/joshmarshall/pinax-theme-bootstrap.git@5eed0fc721826325fcacea40e1830cb1b17d8189#egg=pinax_theme_bootstrap-dev
diff --git a/runtime.txt b/runtime.txt
new file mode 100644
index 0000000..4263511
--- /dev/null
+++ b/runtime.txt
@@ -0,0 +1 @@
+python-2.7.8
diff --git a/templates/index.html b/templates/index.html
index 62dbbdb..324f96a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -70,9 +70,9 @@ <h2>Recent Posts</h2>
                             src="{{ post.author_avatar_url }}"/>
                         <h3>{{ post.title }}</h3>
                         <div class="post-info">
-                            Published on {{ post.pub_date.date_string }} at
-                            {{ post.pub_date.time_string }} by
-                            {{ post.author.name }}
+                            Published on {{ post.pub_date|date }} at
+                            {{ post.pub_date|time }} by
+                            {{ post.author.get_full_name }}
                         </div>
                         <!-- will use summary when we have full post pages -->
                         <div class="post-content">
@@ -90,7 +90,12 @@ <h3>{{ post.title }}</h3>
                         <h2>Tweets</h2>
                     </div>
                 </div>
-                <ul class="post-list" id="tweets"></ul>
+                <div>
+                    <a class="twitter-timeline" href="https://twitter.com/awpug" data-widget-id="521347906880544768">Tweets by @awpug</a>
+                    <script>
+                      !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
+                    </script>
+                </div>
             </div>
 
         </div>
@@ -113,17 +118,3 @@ <h2>Tweets</h2>
     </div>
 </div>
 {% endblock %}
-
-{% block extra_script %}
-<script type="text/javascript" src="{% static "js/twitter_search.js" %}"></script>
-<script>
-jQuery(function() {
-    jQuery(".dropdown-toggle").dropdown();
-    var twitter = new twitterSearch.TwitterSearch({
-        query: "awpug",
-        container: "#tweets"
-    });
-    twitter.init();
-})
-</script>
-{% endblock %}
diff --git a/templates/site_base.html b/templates/site_base.html
index 31faf20..81dbf7e 100644
--- a/templates/site_base.html
+++ b/templates/site_base.html
@@ -1,12 +1,16 @@
 {% extends "theme_base.html" %}
 {% load staticfiles %}
 
+{% block head_title_base %}
+    {{ SITE_NAME }} | {{ object.title }}
+{% endblock head_title_base %}
+
 {% block style_base %}
     {% if USE_COMPILED_STATIC %}
         <link href="{% static "pinax/css/theme.css" %}" rel="stylesheet"/>
         <link href="{% static "css/master.css" %}" rel="stylesheet"/>
     {% else %}
-        <link href="{% static "pinax/css/theme.css" %}" rel="stylesheet">           
+        <link href="{% static "pinax/css/theme.css" %}" rel="stylesheet">
         <link href="{% static "bootstrap/less/bootstrap.less" %}"
             rel="stylesheet/less" type="text/css">
         <link href="{% static "bootstrap/less/responsive.less" %}"
@@ -14,15 +18,15 @@
         <link href="{% static "less/base.less" %}"
             rel="stylesheet/less" type="text/css">
     {% endif %}
-    {% block extra_style %}{% endblock %}                                       
-{% endblock %}                                                                  
-                                                                                
-{% block script_base %}                                                         
+    {% block extra_style %}{% endblock %}
+{% endblock %}
+
+{% block script_base %}
     {% if not USE_COMPILED_STATIC %}
         <script src="{% static "pinax/js/less-1.3.0.min.js" %}" type="text/javascript"></script>
     {% endif %}
-    {{ block.super }}                                                           
-{% endblock %}     
+    {{ block.super }}
+{% endblock %}
 
 {% block body_class %}no-mobile-padding{% endblock %}