Moved the code for building a Map into XLBufferedReader
Merge branch 'master' of github.com:axelmartensson/xl