a truly epic fix

renames "ponytail_3_s" to "ponytail_2_s" because it was the fucking second ponytail
more epic fixing
more epic fixes
returns glorious ponytail 2
fixes what aran told me to fix
Merge pull request #4640 from quiltyquilty/quickfix

a truly epic fix