merging in latest testem-simple, improving docs, dealing with placeholder