fix typo
Merge remote-tracking branch 'ccb/master'
Merge remote-tracking branch 'ccb/master'
Merge remote-tracking branch 'ccb/master'
Merge remote-tracking branch 'ccb/master'
Merge remote-tracking branch 'ccb/master'
Merge remote-tracking branch 'ccb/master'
update license
Merge pull request #298 from mrwhelan/master

replace mrwhelan license agreement