Merge branch 'maint/guides_excerpt' into release/20130702
moving cachebuster into css and js filename to ensure cache bypass
changing theme option to ignore old data, ensuring no 404's on production
moving jquery back into header to try avoiding a merge conflict with my comment branch
fixing commit issue in shc-sso-profile