FIX: Update conda
Merge pull request #42 from Eric89GXL/fix-trav

FIX: Update conda