more formatting stuff
resolve merge, add ethnic details
Merge branch 'master' of github.com:pudo/dataomega