1. Added the latest AWS `elastic-mapreduce` tool (downloaded from https://aws.amazon.com/developertools/Elastic-MapReduce/2264).
2. Added comment to `aws-tools-env.sh` describing how to easily enable its use, if desired.
Merge branch 'master' of github.com:bizo/aws-tools

Conflicts:
	aws-tools-env.sh