Changed to the head branch of easy motion, fixed a bunch of stuff