converted nginx to upstart, and modified server restart function to consolidate both nginx and uwsgi.
converted nginx to upstart, and modified server restart function to consolidate both nginx and uwsgi.

nicorellius/fiblist,nicorellius/fiblist