Merge lp:~summit-hackers/summit/1072071 into lp:summit

[Chris Johnston]

Fixes effects from twitter API deprecation

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2012-10-10 16:02:28 +0000
+++ summit/schedule/templates/schedule/summit.html	2012-11-01 10:18:33 +0000
@@ -93,7 +93,7 @@
                 </div>
         </div>
         <script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
-        <script type="text/javascript" src="http://twitter.com/statuses/user_timeline/{{ summit.hashtag }}.json?callback=twitterCallback2&amp;count=5"></script>  
+        <script type="text/javascript" src="http://api.twitter.com/1/statuses/user_timeline.json?screen_name={{ summit.hashtag }}&callback=twitterCallback2&amp;count=5"></script>  
         {% endif %}
     </article>    
 </div>