simplified stuff
Merge branch 'master' of https://github.com/chasm/mockingbird
simplified, get rid of some rows
got rid of rows
Get new files

Merge branch 'master' of https://github.com/chasm/mockingbird