Server is now only killed when it is detected as running.
Merge pull request #13 from anzenehansen/master

Server is now only killed when it is detected as running.