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
Add template arg to cmd.run* and archive.*
Merge branch 'develop' of github.com:saltstack/salt into develop
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