rename file because of OSX brain-damage
merge from git-annex
Licence changed from GPL to BSD.
update