recapturing models.py, urls.py
todo.org
settings.py
merge prep
updating sources with pubmed_ids
updating sources with pubmed_ids
blah
merge resolution
removed dups from search results (still need to sort results better)
various cosmetic changes for Matt
conflict reso
conflict reso
removed obsolete contributor/user stuff
conflict reso, two-column layout in base.html
conflict reso
futzing with layout
Merge branch 'master' of github.com:marichards/media-db

merging in master
fixed bug in registration (more testing needed); fixed other minor bugs
added versatility to compounds_fields.py
bug fix to compound_fields.py; display compound formula; merge reso