Use typedefs for some maps and some cleanup
Use const references where appropriate
Improve filename pattern matching
fix spelling in comment
Merge remote-tracking branch 'thoronador/fix-spelling'