MNT: Conflict fixes and regenerated cython

[zssherman]

Hi @tkralphs , I noticed you had the pull request for python 3 and your trying to get the code into the master of CyLP. Fixed the conflict involving the GomoryCutGenerator.py file which was a print statement mismatch. With the two cython file conflicts, cylp/cy/CyCoinModel.cpp and cylp/cy/CyOsiCuts.cpp, i reset them, and regenerated with cython, since the conflict for those seem to be a mismatch is two different cython compiled versions between different cython releases. Some commits behind in the master were also added, unless those were missing from this py3 branch for a reason? The code did work for python 3.7 and 3.6 for me, but figured I do a pull request to yours and it should fix the conflict in the pull request python3support, let me know if this version works for you.

[tkralphs]

Hi @zssherman, thanks, this is helpful and also good timing for a ping to get back to this. I wanted to let the pull request sit for a while before merging it to see if any problems arose with the pre-release version I put up, but I've gotten no complaints so far. I hope this means all is well and not that no one is using it! From what I've seen, at least some people are using it. I don't know if I realized there were merge conflicts that had to be resolved, thanks for doing that. I'll take a look at this and probably merge everything into master in the next few days.