Synchronized upstart script with the one recommended by nginx.

http://wiki.nginx.org/Upstart
Merge pull request #41 from percipient/sync-nginx-upstart

Synchronized upstart script with the one recommended by nginx.
ENH: Add install_from_ppa pillar setting and PPA pkgrepo
Merge pull request #42 from westurner/add_install_from_ppa

ENH: Add install_from_ppa pillar setting and PPA pkgrepo
Revert "ENH: Add install_from_ppa pillar setting and PPA pkgrepo"
Merge pull request #43 from saltstack-formulas/revert-42-add_install_from_ppa

Revert "ENH: Add install_from_ppa pillar setting and PPA pkgrepo"
BUG: Fix pkgrepo.managed, from_source -> install_from_source (consistency)
BUG: Conditional pkgrepo.absent instead of enabled, pkgrepo:watch_in
Merge pull request #44 from westurner/add_install_from_ppa

BUG: pkgrepo.absent, pkgrepo:watch_in(pkg), install_from_ppa