make license a short string
remove "Software" form license string
Merge branch 'develop' of git://github.com/coryb/aws-cli into coryb-develop