Is it safe to say that bitcoin is more or less quantum proof then?
That will depend on what new algorithms are developed in the future, and how quickly advancements are made on the discrete logarithm problem.
That being said, if it begins to look like weaknesses in Bitcoin could be exploited, then new address algorithms which are secure against quantum computing algorithms could be developed and added to Bitcoin.
Implementing quantum proof algorithms would require a fork, right?
In any case, let's hope these security measures are implemented quickly if quantum computing takes off in earnest. Even a rumor about the possibility to breach the bitcoin encryption could turn very turbulent.