add arguments to setup.py; merge w/ bib