Illo typo fix
Merge pull request #37 from CondeNast/style-fixes

left rail gets proxima also
One option for the post loop...
Back to the basics.
View for the post loop.
Shortcode handler for the post loop.
remove edit flow statuses - needs-art and web-production
Merge branch 'master' of git://github.com/CondeNast/pangea

merge
send omniture request when user scrolls to bottom of article
Some more changes.
gallery adblock fix
Merge branch 'gallery-ads' of git://github.com/CondeNast/pangea into gallery-ads
fixing very minor error, also wanted to test on ABP as well as adblock before merging with master
Echo, so that it will stay in the paragraph tags.
Bring it all in the right way.
Rename the shortcode using the dash, instead of the underscore.
update point roll tag for next apple campaign
Merge branch 'apple-ad'

Merging minor apple-ad fix into master
Merge branch 'master' into post-loop

Merge master into post-loop
Couple more light CSS changes.