Merge http://github.com/Shoofly/shoofly
Merge http://github.com/shoofly/shoofly