use combinator parsers to allow more complex Map parsing
Merge branch 'pierre/mapparser' of github.com:quantifind/Sumac into pierre/mapparser