Rebase attempt

No idea if I'm rebasing properly or not.  This is my first attempt.
yet another rebase attempt
Merge branch 'rb2' of https://github.com/bpennypacker/ansible into bpennypacker-rb2

Conflicts:
	library/cloud/route53
Added wait parameter
Merge branch 'rb2' of https://github.com/bpennypacker/ansible into bpennypacker-rb2
Fixed small typo from the merge conflict in the route53 module
Merge branch 'bpennypacker-rb2' into devel
Update URLs and email address in setup.py
Add description and examples for the name parameter accepts a url or a local path to a rpm file.
Fix for the cron module on FreeBSD

Apparently crontab on freebsd does not like the file path coming before
the "-u username" portion of the command to install the crontab
Merge pull request #3941 from hnakamur/update_yum_doc_for_name_accepts_url_and_path

Add description and examples for the name parameter accepts a url or a l...
Minor text corrections in the yum module documentation
Use AnsibleError instead of exit for errors in utils
Add name_tag option to set name tag on created disk.
Add name_tag option to set name tag on created disk.
Attempt to create volume from snapshot.
Improved check for empty string
Merge branch 'ec2_vol' of github.com:berenddeboer/ansible into ec2_vol

Conflicts:
	library/cloud/ec2_vol