Merge pull request #14 from michaeldiamant/master

Fix parrot-feeder and parrot-server shell scripts on Ubuntu
Merge remote-tracking branch 'upstream/master'