cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"

This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.

apparently I picked up some other changes I didn't mean to

Conflicts:
	salt/utils/event.py
	tests/integration/utils/test_reactor.py

etest.py

@@ -1,6 +0,0 @@
-import salt.utils.event
-
-event = salt.utils.event.MasterEvent('/var/run/salt/master')
-
-for data in event.iter_events(full=True):
-    print(data)

module-interfaces

@@ -1,89 +0,0 @@
-auth:
-    - __path__ (path to your module dir)
-
-modules:
-    - __pillar__
-    - __salt__
-    - __opts__
-    - __context__ ({'systemd.sd_booted': True})
-    - __grains__
-
-runners:
-    - __pillar__
-    - __salt__
-    - __opts__
-    - __grains__
-
-returners:
-    - __salt__
-    - __opts__
-    - __pillar__
-    - __grains__
-
-pillars:
-    - __salt__ (modules)
-    - __opts__
-    - __pillar__
-    - __grains__
-
-# nothing
-tops:
-    - ['__builtins__', '__file__', 'subprocess', 'yaml', '__name__', '__package__', '__doc__']
-
-outputters:
-    - __opts__
-    - __pillar__
-    - __grains__
-
-states:
-    - __pillar__
-    - __low__ (lowstate structure?)
-    - __env__
-    - __running__
-    - __lowstate__
-    - __salt__
-    - __opts__
-    - __grains__
-
-log_handlers:
-    - __path__
-
-renderers:
-    - __salt__ - Execution functions (i.e. __salt__['test.echo']('foo'))
-    - __grains__ - Grains (i.e. __grains__['os'])
-    - __pillar__ - Pillar data (i.e. __pillar__['foo'])
-    - __opts__ - Minion configuration options
-    - __env__ - The effective salt fileserver environment (i.e. base). Also referred to as a "saltenv". __env__ should not be modified in a pure python SLS file. To use a different environment, the environment should be set when executing the state. This can be done in a couple different ways:
-        Using the saltenv argument on the salt CLI (i.e. salt '*' state.sls foo.bar.baz saltenv=env_name).
-        By adding a saltenv argument to an individual state within the SLS file. In other words, adding a line like this to the state's data structure: {'saltenv': 'env_name'}
-    - __sls__ - The SLS path of the file. For example, if the root of the base environment is /srv/salt, and the SLS file is /srv/salt/foo/bar/baz.sls, then __sls__ in that file will be foo.bar.baz.
-
-grains:
-    - __salt__
-    - __opts__
-    - __pillar__
-    - __grains__
-
-
-
-
-
-
-
-
-# TODO later
-
-
-cloud:
-    -
-
-search:
-    -     - ['__builtins__', 'salt', '__file__', '__package__', '__path__', '__name__', 'os', '__doc__']
-
-# TODO
-roster:
-    -
-
-# TODO
-proxy:
-    -

tests/integration/utils/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

tests/unit/templates/roots/mtime_map

@@ -1,11 +0,0 @@
-/home/jacksontj/src/salt/tests/unit/templates/files/test/hello_import_generalerror:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/macroundefined:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/hello_import:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/hello_import_undefined:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/hello_simple:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/non_ascii:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/hello_import_error:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/macro:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/macroerror:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/hello_include:1391303592.17
-/home/jacksontj/src/salt/tests/unit/templates/files/test/macrogeneral:1391303592.17