some cleanup
breaking things
Merge branch 'master' of github.com:ComplingFTW/sblangmap