BUG: botched url
COMP: conflict resolution
DOC: cleaned up discussion of source code directory