Merged upcoming to master, and launchpad to github

[Anders F Björklund]

Stephen Morris wrote:

>    Having downloaded smart 1.5, with both python 2.7 and python 3.3 installed, how do I build smart for python 3.3 rather than its default of python 2.7?

If you want to try the python3 version, you need to checkout the "py3k" branch:

git checkout -tb py3k origin/py3k

Then make (and setup.py, smart.py, etc) should default to "python3" automatically.

There is no particularly good reason for doing so, however. python is the default.

--anders