fix #595 and fix #550

@antgonza, it looks like the path will be something like `templates/1_20141120-01:31:45`; I think what @josenavas is saying is that if you included `cls.__name__` in the filename, it would be nice, so that it will be named something like: `templates/1_SampleTemplate_20141120-01:31:45` or `templates/1_PrepTemplate_20141120-01:31:45`