Remove some more old code
Add readme
Merge remote-tracking branch 'origin/master'