schema first pass
Merge branch 'master' of github.com:escapewindow/mapper