Merge pull request #547 from ashawley/fix-518-tweets

Fix twitter feed on home page.

closes #518

Author: jarrodu

_includes/footer.html

@@ -53,7 +53,6 @@
     <!-- jquery js -->
     <script src="{{ site.baseurl }}/resources/js/vendor/jquery-1.8.3.min.js" type="text/javascript" ></script>
     <script src="{{ site.baseurl }}/resources/js/vendor/jquery.stellar.min.js" type="text/javascript" ></script>
-    <script src="{{ site.baseurl }}/resources/js/vendor/tweetMachine.min.js" type="text/javascript" ></script>
 
     <!-- modernizr js -->
     <script src="{{ site.baseurl }}/resources/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js" type="text/javascript" ></script>

_layouts/frontpage.html

@@ -219,7 +219,9 @@ <h2 class="twitterhdr"><span>Scala on Twitter</span></h2>
     </div>
     <div class="row">
       <div class="span12">
-        <div id="tweets" class="tweets"></div>
+        <div id="tweets" class="tweets">
+          <a class="twitter-timeline" data-tweet-limit="4" data-chrome="noheader nofooter noborders" href="https://twitter.com/scala_lang">Tweets by scala_lang</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+        </div>
         <br/>&nbsp;
         <div class="see-more-tweets">See more tweets, or</div>
         <a id="twitter-btn" href="https://twitter.com/scala_lang">Follow Scala on Twitter</a>