Merge remote-tracking branch 'upstream/master' into develop
Adding fedoraremi (Fedora Remix) to _OS_NAME_MAP
Fedora Remix shows the cpu flags as Features
Add force_reload for debian_service, upstart and systemd and use it as default in mod_watch if available
Add template arg to cmd.run* and archive.*
Merge remote branch 'upstream/develop' into cmd.run-templates
Add docstrings for template arg.
Add template argument docs for cmd.run*
Merge pull request #2936 from ryanschneider/cmd.run-templates

cmd and archive modules template arg
Change nova references to glance
Add release docs
Merge pull request #2938 from techhat/glance

Change nova references to glance
Remove reference to schema

Postgresql has a meaningful difference between schema and database, so conflating them here could be confusing:

http://www.postgresql.org/docs/9.2/static/ddl-schemas.html
Merge pull request #2939 from peterlandry/develop

Remove reference to schema
cron.raw_cron needs exactly raw stdout from cmd.run
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.