Revert addition of codegangsta/martini