Merge branch 'master' of http://github.com/hardbol/spitbol
Merge branch 'master' of http://github.com/hardbol/spitbol