Correct use of setup.py; parse_url_components writes over existing options
Merge branch 'populate' into gh-pages
latest beta 3