Remove unnec. templates

Now superceded by changes in master.
Modernise requirements files

Bring package version up to date.
Merge remote-tracking branch 'upstream/master'