This commit is here to enable travis on my scipy branch