attempt new traviconda
fix travis
move back to master