Cleanup
Merge branch 'master' of http://github.com/tenach/scrib
Merge branch 'master' of http://github.com/tenach/scrib
Merge branch 'master' of http://github.com/tenach/scrib
More cleanup