Fix for build issues

[corranwebster]

Should fix #229

[jwiggins]

Uhh... you're reverting a change that you made: 8f3ff1b

Do you remember why you made that change to begin with?

[jwiggins]

Well... I think the Travis failure answered the "why".

Odd. 😒

[corranwebster]

Very odd - it looks like pip install wants one thing and setup.py develop wants the other.

Mind you, setup.py develop is dodgy when combined with 2to3.

[corranwebster]

OK, so problem is that if you don't do the builder swap then the integration tests are not updated to Python 3 - but doing the builder swap is not the right thing to do, I think. I'd say that probably the best option is to make the integration tests work on both 2 and 3 with the same codebase.

[corranwebster]

And the code in the integration tests is horrible, so I've folded them into the Kiva test suites instead. They may need some tweaking to run under Python 3.

[corranwebster]

OK - back to builds working. @jwiggins or @itziakos if you have a chance to double-check this it would be good. I haven't checked that pip install . works properly yet, and won't have a chance until this evening.

[jwiggins]

I just tested pip install . on a fresh Python 3.4 virtualenv. It worked. I'm 👍 on this PR

[corranwebster]

Thank you.