Arrowhead 20140930 rc

Changes based on PR review:
-move error raising to method call site, rather than in method
-rename get_shape_set to get_shape_group
Why two lines?