refactor diff
more refactor
update dependencies and change testing to PhantomJS