Updated docs and tmpls
Snapshotted flickcurl_1_25 for 1.25 release (GIT 4222075303446c1f1241282a41838557876559b2)