wtf is this shit?
More cleanup...
Merge branch 'master' of github.com:tenach/scrib