Tweaked merge_hash to also affect Runner behavior
Merge branch 'combine_vars' of git://github.com/laggyluke/ansible into exp

Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	lib/ansible/runner/__init__.py
	lib/ansible/utils/__init__.py
	test/TestPlayBook.py