Merge remote-tracking branch 'upstream/master' into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Adding fedoraremi (Fedora Remix) to _OS_NAME_MAP
Fedora Remix shows the cpu flags as Features
Merge branch 'develop' of github.com:saltstack/salt into develop
Add force_reload for debian_service, upstart and systemd and use it as default in mod_watch if available
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Start on the reactor docs
Merge pull request #2940 from giantlock/develop

cron.file state fix
Build docs before trying to copy doc files
change from jinja's PackageLoader to FileSystemLoader

this removes the dependency on distribute (setuptools) at runtime.
added some checks around each of the calls to get_template, to
catch the exception thrown when the template environment cannot be
loaded by the FileSystemLoader.

a good TODO / follow-up to this would be to enhance
states/network.py to better handle the situations this creates...
Some minor cleanup of unit and integration tests.
Moved locale_info grain outside of os_data

cleaning up os_data function
created locale_info function to provides defaultlanguage and
defaultencoding
These were previously in os_data, but no reason to be
Merge pull request #2945 from techhat/fedoraremi

Adding fedoraremi (Fedora Remix) to _OS_NAME_MAP
Updated docs for grains, modules, and states

Added links to module function documentation, as well as to
"file_roots", and mentioned the saltutil.sync_* functions. Will probably
do the same for returners and renderers soon. This should help people
navigate through the docs easier.
Merge pull request #2946 from archtaku/docs

Updated docs for grains, modules, and states