Merge branch 'sam_cloud' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
ps module: add get_users
ps: optional usage of utmp python module for get_users
Skip temporary files.
fix naming of modules.mysql.quoteIdentifier() to follow convention
Merge pull request #8980 from hulu/snake_case-not-camelCase

fix naming of modules.mysql.quoteIdentifier() to follow convention
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Some more missed `vm_config` to `profiles_config` missed occurrences.
Avoid conflicting options.

If you're a superuser, you already have permissions to create a user. Postgres will complain about conflicting options if you attempt to pass both. Refs #8717.
lint fixes
@kiorky please finish cleaning up the double quotes sometime

It is nice to keep the style clean, also, do we need the Logger
class? why can't we just use the salt logging? or am I missing
something?
Fix stack trace in event fixes
Add another not
Add unit tests regarding `include.d` directories loading.
Merge pull request #8982 from s0undt3ch/hotfix/salt-cloud-merge

Missed `vm_config` to `profiles_config` and tests
Merge pull request #8981 from cachedout/#8717

Avoid conflicting options.
just use an else
Make ps execution module available for psutil>=0.3.0

After looking at some of the older source code versions, it seems that
the majority (if not all) of the features present in the ps execution
module became available between psutil release 0.2.0 and 0.3.0. This
commit removes the python version check in the __virtual__ function, and
replaces it with a check of the psutil version. Only psutil versions
greater than or equal to 0.3.0 will result in the ps execution module
being available.
Merge remote-tracking branch 'upstream/develop' into sam_20131202