Only generates media when using the include_media tag
fixes settings import
Merge pull request #1 from hughes/master

Speeds up non-media requests