fix merge conflict
Merge branch 'master' of github.com:pforsyth/executabl.es
remove old license