Make usage of source_hash more flexible.
	modified:   salt/modules/file.py
	modified:   salt/states/file.py
Make usage of source_hash more flexible.
	modified:   salt/modules/file.py
	modified:   salt/states/file.py
Merge pull request #9446 from FleetingClouds/develop

Address the issue "file.managed is TOO secure"
Revert "Better trace for nested jinja errors"

This reverts commit 99a2791917b24a6e58e28bfc6c6fa188d720e013.
Add a few basic, missing file functions
Merge pull request #9495 from techhat/fuse

Add a few basic, missing file functions
Fix lint errors from #9446

@martinhbramwell there were a few lint issues in your PR, just
so you know for next time :)
http://jenkins.saltstack.com/job/salt-lint/1671/violations/
Add CLI Example to extract_hash
Remove .old & .orig files from debian_ip templates

Leftovers from a Git merge in e30bd167.
Another swing at fixing Postgres tests.
Merge pull request #9496 from cachedout/unit-tests

Another swing at fixing Postgres tests.
virtualenv.managed: use "user" instead of "runas" for pip install

This commit changes the virtualenv.managed state to use "user" instead
of "runas" when it runs pip.install to satisfy a requirements file.
deprecate runas argument in virtualenv.create
Return locally installed version if no newer is available
Merge pull request #9497 from terminalmage/issue8190

Use "user" instead of "runas" argument when calling pip.install from virtualenv.managed state
Fix RHEL5 zmq unit tests

* Import zmq, check its attr and skip test if necessary.
Fix ref to unimported name
Merge pull request #9498 from cachedout/unit-tests

Fix RHEL5 zmq unit tests
2014.01.0 release notes
Alias module.watch to module.wait

This was done recently for cmd.watch, so this commit aliases the
module.watch state as well for consistency.