Remove addressable require
Fix watch path in Guardfile