Minor polish, updated demo poms to use quickstart pom as parent