Merge branch 'master' of github.com:opengeo/mapstory into vanity-pages

Conflicts:
	models.py
	settings.py
Minimize header on org pages refs #598
carousel image resizing via js
cleanup link detection, use URLField
extract linkedit js and html
fix error in content edit button
float edit buttons to right
Merge branch 'vanity-pages' into integration

Conflicts:
	models.py