Merge pull request #42 from ehenneken/ticket_474

Ticket 474: get_doc from adsdata needs 'manipulate=False'
Ticket 436: necessary new config params for metrics
Ticket 436: total overhaul of metrics module