Renamed file.
Renamed UK national energy policy file.
Merge branch 'master' of ssh://projects.appropriatesoftware.org/assembly/git