Merge branch 'with_inventory_hostnames' of git://github.com/sdossett/ansible into inv_hostnames
Update CHANGELOG
Merge remote branch 'origin/devel' into devel