Add copyright to license
Remove full text of license
Add makedirs parameter where necessary
Merge latest set of changes from upstream