Update LICENSE and setup.py
Merge branch 'master' into fusionbox
Merge branch 'master' into fusionbox
Merge branch 'master' into fusionbox
Merge branch 'master' into fusionbox
Merge branch 'master' into fusionbox
Merge branch 'fusionbox'