0.2 backports

Currently Activator's version of sbt-remote-control has these two changes, but they aren't on 0.2