Remove pid files, we're killing those with bash commands now
Merge branch 'dev' of github.com:jg/dfs into dev

Conflicts:
	src/main/java/DeathWatch.java
	src/main/java/Server.java
	src/main/resources/application.conf