make awscli is now make cli

Also group cli targets with hardcoded version numbers together for
easier updates for new aws releases