Pulling in Jon's changes

@jonschlinkert I'm just pulling in your changes to the main repo.