different merging strategies and python2 compatibility
Merge branch 'master' of github.com:janoliver/inkscapeslide2
readme