Add template files to MANIFEST.in
Note bugfix and bump version
Merge branch 'master', remote branch 'upstream/master'