merge origin devel
Merge branch 'devel' into masahide
Update URLs and email address in setup.py
Take out the spaces inside the parenthesis to match the rest of the code.
Merge branch 'devel' of git://github.com/ansible/ansible into masahide