Merge pull request #81 from mozilla/development

Pushing through development to master
Merge pull request #83 from rossbruniges/development

Fix bug #82 - adding in a context processor to send through the HTTP_PRO...
Merge pull request #84 from mozilla/development

Development to master with http/https fix
Merge branch 'development'
Merge branch 'master' of git://github.com/mozilla/source
add border to article images
code index json feed to use HTTP_PROTOCOL template var
return model objects to standard manager, so caching doesn't screw admin. closes #87
fix blockquote vs. floating aside
add OL style
allow for articles without article_type in the category overline
update code_detail page repo links, repo h1
Merge pull request #95 from ryanpitts/master

Yeah I think this is looking good, as mentioned we've had problems with the far too aggressive cache-machine in the past and I believe that our fix then was to stop using is everywhere and just in smaller situations :)
Merge pull request #99 from ryanpitts/development

Keep dev branch in sync
move article image above headline
adjust height of list thumbnail images
Merge pull request #103 from ryanpitts/development

image alignment adjustments
remove css height on list thumbnails to fix at responsive widths
Merge pull request #105 from ryanpitts/development

remove css height on list thumbnails to fix at responsive widths
overflow:hidden on page-block in case of float issues