Changing license to LGPL v2.1
Fixing merge conflict
Merge branch 'garrettw-master'
Minor tweaks + fix composer.json
minor formatting tweaks