changed naming on upstart script for supervisorctl behavior

Not sure if you guys are having the same issues that I am with the pip instancing supervisor ...

details outlined here:
http://cuppster.com/2011/05/18/using-supervisor-with-upstart/

TLDR:
supervisorctl picks up /etc/init/supervisord.conf and attempts to use it as a supervisor configuration file **instead** of an upstart script


<pre>
$ salt '*' state.highstate
...

----------
          ID: supervisor-service
    Function: service.running
        Name: supervisor
      Result: False
     Comment: One or more requisite failed
     Changes:  

...
</pre>
Except that then we'd need to change the "supervisor-service" id, as thats not a default location for a configuration per: http://supervisord.org/configuration.html

.. so long as:
1) The upstart script is named:supervisor.conf
and
2) The conf script is named: supervisord.conf

Then it should work in all cases, without needing to modify the "supervisor-service" id to run with a custom -c flag, to specify a non-standard config location.