Fix bootstrap code on Python 3
Test on Python 3.4
Don't test on Python 3.4 :(
Fix merge conflicts