Upgrade to Guard 2.0 and fix a few other deprecations.

The Tests are broken when using Guard 2.10.1 , though it looks like this is down to Guard.