drush changes
Merge branch '7.x' of https://github.com/discoverygarden/manidora into 7.x
Limit newspaper searches to just the three newspaper related cmodels.
Cleanup files from tmp in derivative creation.
Merge branch '7.x' of github.com:jordandukart/manidora into 7.x
Filter added in wrong spot.
Merge branch '7.x' of github.com:jordandukart/manidora into 7.x
Merge pull request #42 from jordandukart/7.x

HQ JPG uncommited things from live and newspaper search fix.