Merge branch 'master' of git://github.com/Shoofly/shoofly
Merge branch 'master' of git://github.com/Shoofly/shoofly