Merging gsintro branch

Contains an updated (as of mid-2013) version of the Intro to GeoServer workshop.