Merge branch 'ocean' into devel

Conflicts:
	library/cloud/digital_ocean
Merge remote branch 'origin/devel' into devel
update changelog
Merge pull request #3226 from jpmens/ini_file2

ini_file: add support for lists of options/values
Merge branch 'with_inventory_hostnames' of git://github.com/sdossett/ansible into inv_hostnames
Merge pull request #3091 from sdossett/with_inventory_hostnames

with_inventory_hostnames inventory based lookup plugin
Update CHANGELOG
Merge pull request #3171 from mynameisdaniil/devel

Adds 'groups' field into ec2 plugin
Merge remote branch 'origin/devel' into devel
Update changelog
Quote some strings in the docs
Merge branch 'rds' of git://github.com/bpennypacker/ansible into rds
Various code reformatting
Update changelog
Merge pull request #3149 from blandonnimrat/devel

added error checking on connect_to_region() in ec2.py
Merge pull request #3114 from laggyluke/roles_combine_vars

Added basic support for hash_behaviour=merge in roles
Merge remote branch 'origin/devel' into devel
Merge branch 'PR_add_chdir_to_pip' of git://github.com/y-p/ansible into devel

Conflicts:
	library/packaging/pip
Merge pull request #3273 from jlund/ansiblecc-to-ansibleworkscom

Update all ansible.cc references in the documentation to point to ansibleworks.com
YAML fix