fixed major bug with layout system
was due to the earlier distinction of template from layout
updated README documentation
update a few misc things
tweaked shortcode type detectionfor test data
fixed so duplicate shortcodes are not generated for test data
changed so that shortcode substitution is more robust