Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Move mySociety logos to the asset pipeline
Remove images that are no longer used
Move the custom stylesheet to be used in the asset pipeline
Remove inclusion of old stylesheet.
Generalise asset path prepend for all standard types.
Generate custom.css from SCSS & use the sass-rails image-url helper
Add back the old mysociety logo images - not sure why these were dropped
Fix the serving of two images
Make sure images are referenced with image_tag

This is so that they will be correctly served by the asset
pipeline.
Merge remote-tracking branch 'origin/switch-to-asset-pipeline' into develop