Re-organized mapper group structure.
Minor readme tweaks
Reorganized spec mapper groups. Removed parenthesis requirement for error matchers.