Fixed and updated ``six`` to 1.5.2 since this is new