Add support for json/yaml config file alongside with fabfile
Add support for multiple env states
Add option to merge env states instead of update
Document env.merge_states
Set current env.state
Fix ReST docs too short title underline
Changelog, fixes #1088
Add option to prompt hosts before execution
Document --prompt_hosts
Changelog, fixes #1176
Spelling
Extend _AttributeDict with deep dot notation,
parent fallback and variable expansion
Merge branch 'refs/heads/multiple-env-states' into develop

* refs/heads/multiple-env-states:
  Changelog, fixes #1088
  Fix ReST docs too short title underline
  Set current env.state
  Document env.merge_states
  Add option to merge env states instead of update
  Add support for multiple env states

Conflicts:
	sites/www/changelog.rst
	tests/test_main.py
Merge branch 'refs/heads/prompt-hosts' into develop

* refs/heads/prompt-hosts:
  Spelling
  Changelog, fixes #1176
  Document --prompt_hosts
  Add option to prompt hosts before execution

Conflicts:
	sites/www/changelog.rst
Merge branch 'refs/heads/env-vars' into develop

* refs/heads/env-vars:
  Extend _AttributeDict with deep dot notation, parent fallback and variable expansion

Conflicts:
	fabric/utils.py