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