Updating deps for ruby 2.1.0 and fixing mochs