Bound images to the content column so there is no overflow. Fixes #196
Merge remote-tracking branch 'heyts/master'

Conflicts:
	static/css/output-ie.css
	static/css/output.css
Export the env var, d'oh.