Merge branch '283-with-settings-decorator' into 1.1

Conflicts:
	fabric/api.py

fabric/api.py

@@ -7,7 +7,7 @@
 well when you're using setup.py to install e.g. paramiko!
 """
 from fabric.context_managers import cd, hide, settings, show, path, prefix, lcd
-from fabric.decorators import hosts, roles, runs_once, ensure_order
+from fabric.decorators import hosts, roles, runs_once, ensure_order, with_settings
 from fabric.operations import (require, prompt, put, get, run, sudo, local,
     reboot, open_shell)
 from fabric.state import env, output