Renamed our _.wrap because it clashes with underscores!
Merge pull request #307 from mattdenner/fix_wrap_name_clash

Fix wrap name clash