Merge branch 'master' of github.com:opengeo/mapstory into vanity-pages
Some tweaks to work around errors @ischneider, please fix up if necessary
add Links and Resources Header