d9fdcdc6d8770b111dbf9df8835d92c89aeec166

fixed conflicts

eafb1861bfdc0f92b07282451731d59c3ba7a11d

quick typo fix

a2e98b422d0aed46c5af28bbb3de7244f09c5151

removing rack.rb as we have no custom modifications, and so it's un-necessary

4d00c4bfe62c5800fb8c01ba2323f047b09e1b6b

Merge branch 'master' of git://github.com/dstrelau/feather into dstrelau/master

429dcc67a1a2cb5ad3cb987a64dfb8e75b62ab4b

Merge branch 'master' of git://github.com/ivey/feather-plugins into ivey/master

e8927243a83ebdc5b7722d76818eb0a64abb3665

Merge branch 'master' of git://github.com/dstrelau/feather-plugins into dstrelau/master

8750a3057a899981f82d8b038c64d0d9aeaba8d3

Merge branch 'stylesfix' of git://github.com/fujin/feather-plugins into fujin/stylesfix

de176fec697db73c6d9936cc0bebb075e150025e

Merge branch 'uploadsfix' of git://github.com/fujin/feather-plugins into fujin/uploadsfix