Fix the case of getting an empty salt file during a second read attempt.
Add missed changes for the previous commit.
Merge branch 'develop' into sls_render_pipe
Make it possible to use an OrderedDict for yaml map and omap.

Also, added a -o option to the yaml renderer to enable the use
of OrderedDict for yaml.
Bug fixes and enhancments.

- Fixed a bug in the stateconf renderer that does not account for state
  names written using the shorthand form(ie, like cmd.run, file.managed,
  ...etc).

- Added the ability for Salt's YAML custom loader to use OrderedDict for
  !map and !omap YAML types.

- Made the built-in yaml renderer takes an option(-o) to use OrderedDict
  for YAML.

- Fixed a bug caused by reorg in utils/templates.py that doesn't return
  the filename of the rendered output file.

- Fixed the problem with the existing uses of keyword arguments as
  context key names that collides with parameter names in render_tmpl()
  of utils/templates.py.

- Noted the sls encoding issues in template.py and utils/templates.py

- Added goal state generation and implicit state ordering to the
  stateconf renderer.
Merge branch 'develop' into sls_render_pipe

Conflicts:
	salt/renderers/json.py
	salt/renderers/stateconf.py
	salt/renderers/yaml.py
	salt/template.py
	salt/utils/templates.py
Update comments.
fix two typos in pip module: --extra-index-url, --download-cache
Travis-CI should build on all branches.
Merge pull request #2447 from danielliang/develop

fix two typos in pip module: --extra-index-url, --download-cache
Merge branch 'develop' of github.com:saltstack/salt into develop
Module for viewing and modifying sysctl parameters for FreeBSD
minor spelling fix in doc string
Merge pull request #2450 from giantlock/develop

Module for viewing and modifying sysctl parameters for FreeBSD
Update salt/modules/network.py

The `ip address` command does not list interfaces that are not up/configured. It now gets the output from the `ip link` command as well for those interfaces.

Before:
<pre>
{'brynhilde': {'eth1': {'hwaddr': '00:30:48:34:2a:cb',
                        'inet': [{'address': '10.7.161.4',
                                  'broadcast': '10.7.175.255',
                                  'label': 'eth1',
                                  'netmask': '255.255.240.0'}],
                        'inet6': [{'address': '2620:0:170:9900:230:48ff:fe34:2acb',
                                   'prefixlen': '64'},
                                  {'address': 'fe80::230:48ff:fe34:2acb',
                                   'prefixlen': '64'}],
                        'up': True},
               'eth4': {'hwaddr': '00:02:c9:32:06:30',
                        'inet': [{'address': '75.75.11.23',
                                  'broadcast': '75.75.11.255',
                                  'label': 'eth4',
                                  'netmask': '255.255.255.0'}],
                        'inet6': [{'address': 'fe80::202:c9ff:fe32:630',
                                   'prefixlen': '64'}],
                        'up': True},
               'lo': {'hwaddr': '00:00:00:00:00:00',
                      'inet': [{'address': '127.0.0.1',
                                'broadcast': None,
                                'label': 'lo',
                                'netmask': '255.0.0.0'}],
                      'inet6': [{'address': '::1', 'prefixlen': '128'}],
                      'up': True}}}
</pre>

After:
<pre>
{'brynhilde': {'eth0': {'hwaddr': '00:30:48:34:2a:ca', 'up': False},
               'eth1': {'hwaddr': '00:30:48:34:2a:cb',
                        'inet': [{'address': '10.7.161.4',
                                  'broadcast': '10.7.175.255',
                                  'label': 'eth1',
                                  'netmask': '255.255.240.0'}],
                        'inet6': [{'address': '2620:0:170:9900:230:48ff:fe34:2acb',
                                   'prefixlen': '64'},
                                  {'address': 'fe80::230:48ff:fe34:2acb',
                                   'prefixlen': '64'}],
                        'up': True},
               'eth2': {'hwaddr': '00:07:43:13:48:00', 'up': False},
               'eth3': {'hwaddr': '00:07:43:13:48:08', 'up': False},
               'eth4': {'hwaddr': '00:02:c9:32:06:30',
                        'inet': [{'address': '75.75.11.23',
                                  'broadcast': '75.75.11.255',
                                  'label': 'eth4',
                                  'netmask': '255.255.255.0'}],
                        'inet6': [{'address': 'fe80::202:c9ff:fe32:630',
                                   'prefixlen': '64'}],
                        'up': True},
               'lo': {'hwaddr': '00:00:00:00:00:00', 'up': True}}}
</pre>
*) add functions enable(name), disable(name), enabled(name), disabled(name) according common service interface.
*) fix pep8 typo
Adding basic openstack nova module
Merge pull request #2451 from twinshadow/patch-2

Update salt/modules/network.py: get all interfaces for the `ip` command
Merge pull request #2452 from giantlock/develop

bring interface of freebsdservice in order according modules/service.py
Merge pull request #2453 from techhat/master

Adding basic openstack nova module