Changed default path to OctoPrint executable

When installed via python setup.py install, it defaults to /usr/local/bin/octoprint, not /usr/bin/octoprint
Merge remote-tracking branch 'origin/master'