Fixed regression in dev branch killing pies
Prevent piling up phantomjs process when starting fails
Merge remote-tracking branch 'upstream/master'