Update from template

Also fix MANIFEST.in for releasing