Ranking metrics: clean up, added MAP

Related with #33